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)
commit92b9bf4...15346b8dae14772e07905ebb6ad29a47
tree419bc15...0474741102b5a9096ee36dd5666d1d15copy hash to clipboard (tree)
parentcd76778...49e33c45376c67230c200c7e62ab7a35copy hash to clipboard (diff)
parent6d7afe0...f29df75f831a46fb0f657fa37e561779copy hash to clipboard (diff)
http.c