Merge branch 'sr/http-proxy-configuration-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Apr 2017 05:07:44 +0000 (22:07 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Apr 2017 05:07:44 +0000 (22:07 -0700)
commit6b51cb61812c11915dbcc1d6daeee60ac77297de
tree7437484708ae15e7960872ddf0df6802337051af
parent6a2c2f8d34fa1e8f3bb85d159d354810ed63692e
parentae51d91105981888f58ad21825b4ef0c540032e3
Merge branch 'sr/http-proxy-configuration-fix'

"http.proxy" set to an empty string is used to disable the usage of
proxy.  We broke this early last year.

* sr/http-proxy-configuration-fix:
  http: fix the silent ignoring of proxy misconfiguraion
  http: honor empty http.proxy option to bypass proxy
http.c