Merge branch 'jc/http-socks5h'
authorJunio C Hamano <gitster@pobox.com>
Fri, 22 Apr 2016 22:45:09 +0000 (15:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 Apr 2016 22:45:09 +0000 (15:45 -0700)
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://

1  2 
http.c
diff --cc http.c
Simple merge