Merge branch 'jc/http-socks5h' into maint
commit6b9eee2bb2934d94a5bbcbcdd28b851d71ffc5ae
authorJunio C Hamano <gitster@pobox.com>
Mon, 2 May 2016 21:24:10 +0000 (2 14:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 May 2016 21:24:10 +0000 (2 14:24 -0700)
treea4e4f6ec31daea1e2e21cc3654f317643493e390
parente18ace0951febce5a5fa9eeecfec4e523b1d6146
parent87f8a0b279def4da439b5e0e41f517a05ef110f0
Merge branch 'jc/http-socks5h' into maint

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://
http.c