From: Jeff King <peff@peff.net>
Date: Tue, 1 Dec 2015 22:19:12 +0000 (-0500)
Subject: Merge branch 'pt/http-socks-proxy' into maint
X-Git-Tag: v2.6.4~20
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/92b9bf4a15346b8dae14772e07905ebb6ad29a47

Merge branch 'pt/http-socks-proxy' into maint

Add support for talking http/https over socks proxy.

* pt/http-socks-proxy:
remote-http(s): support SOCKS proxies
---

92b9bf4a15346b8dae14772e07905ebb6ad29a47