Merge branch 'js/https-proxy-config'
commitaaa625567aa9f5d2881c5e3a23f3bdffe8aaf93e
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Mar 2020 20:57:42 +0000 (25 13:57 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Mar 2020 20:57:42 +0000 (25 13:57 -0700)
tree0f92708bffe94ffb7f1c95ec7cc3f705c49599c9
parentc4a09cc9ccb63090b78a4d9529462151df62d73d
parentaf026519c9cf82928be111974e89bc122765f13f
Merge branch 'js/https-proxy-config'

A handful of options to configure SSL when talking to proxies have
been added.

* js/https-proxy-config:
  http: add environment variable support for HTTPS proxies
  http: add client cert support for HTTPS proxies
Documentation/config/http.txt
http.c