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)
Add support for talking http/https over socks proxy.

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

1  2 
http.c

diff --cc http.c
Simple merge