Merge branch 'jc/http-socks5h'

The socks5:// proxy support added back in 2.6.4 days was not aware that socks5h:// proxies behave differently. * jc/http-socks5h: http: differentiate socks5:// and socks5h://

Junio C Hamano committed Apr 22, 2016 at 15:45 UTC 1c4f47690074de3c27c1a2124779bfe2898f295d

No changes.