Merge branch 'ws/curl-http-proxy-over-https'
authorJunio C Hamano <gitster@pobox.com>
Thu, 28 Dec 2017 22:08:50 +0000 (14:08 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 28 Dec 2017 22:08:50 +0000 (14:08 -0800)
commitfc4a226bf60be67bc3d574aeafe06d266f700d99
treeb3c5bbc0c737d86604e4bb8ea6fb4d1b9f88a025
parentf53edaf2d5983f82ffb513e10569bbfbe540613d
parent82b6803aeec62489977b98804b0a18396d3c6ebf
Merge branch 'ws/curl-http-proxy-over-https'

Git has been taught to support an https:// URL used for http.proxy
when using recent versions of libcurl.

* ws/curl-http-proxy-over-https:
  http: support CURLPROXY_HTTPS
http.c