From: bors <bors@rust-lang.org>
Date: Fri, 27 Jan 2017 03:56:09 +0000 (+0000)
Subject: Auto merge of #3598 - pornel:proxyconf, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~11^2~16
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=19dc757120ed945fd591bf905bdf62540a3ffc74;p=cargo.git

Auto merge of #3598 - pornel:proxyconf, r=alexcrichton

Example proxy config

#3596
---

19dc757120ed945fd591bf905bdf62540a3ffc74