tree 6f49dd368bde8cdbf8c7356201f8d8e1fae990f6
parent e2a318f796fa22f71051f48b712da3884cbc9374
parent 1c2dbf2095beb5227d963a1541e356bd2e834dff
author Junio C Hamano <gitster@pobox.com> 1424907612 -0800
committer Junio C Hamano <gitster@pobox.com> 1424907612 -0800

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