From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 May 2016 21:24:10 +0000 (-0700)
Subject: Merge branch 'jc/http-socks5h' into maint
X-Git-Tag: v2.8.3~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6b9eee2bb2934d94a5bbcbcdd28b851d71ffc5ae;p=thirdparty%2Fgit.git

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://
---

6b9eee2bb2934d94a5bbcbcdd28b851d71ffc5ae