4.2
Merge changes from forks (#17213)
Add support for SOCKS5 private authentication methods (RFC#1928) (#15470)