Merge branch 'pt/http-socks-proxy' into maint
authorJeff King <peff@peff.net>
Tue, 1 Dec 2015 22:19:12 +0000 (17:19 -0500)
committerJeff King <peff@peff.net>
Tue, 1 Dec 2015 22:19:12 +0000 (17:19 -0500)
commit92b9bf4a15346b8dae14772e07905ebb6ad29a47
tree419bc1570474741102b5a9096ee36dd5666d1d15
parentcd76778049e33c45376c67230c200c7e62ab7a35
parent6d7afe07f29df75f831a46fb0f657fa37e561779
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
http.c