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

Jeff King committed Dec 1, 2015 at 17:19 UTC 92b9bf4a15346b8dae14772e07905ebb6ad29a47

No changes.