Merge branch 'tc/missing-http-proxyauth'
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Feb 2015 23:40:12 +0000 (15:40 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Feb 2015 23:40:12 +0000 (15:40 -0800)
commit90eea883fd86a272a32c7d5f363445776e0680e2
tree6f49dd368bde8cdbf8c7356201f8d8e1fae990f6
parente2a318f796fa22f71051f48b712da3884cbc9374
parent1c2dbf2095beb5227d963a1541e356bd2e834dff
Merge branch 'tc/missing-http-proxyauth'

We did not check the curl library version before using
CURLOPT_PROXYAUTH feature that may not exist.

* tc/missing-http-proxyauth:
  http: support curl < 7.10.7
http.c