From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 22 Apr 2016 22:45:09 +0000 (-0700)
Subject: Merge branch 'jc/http-socks5h'
X-Git-Tag: v2.9.0-rc0~105
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c4f47690074de3c27c1a2124779bfe2898f295d;p=thirdparty%2Fgit.git

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

1c4f47690074de3c27c1a2124779bfe2898f295d