From: bors <bors@rust-lang.org>
Date: Fri, 7 Oct 2016 17:55:46 +0000 (-0700)
Subject: Auto merge of #3171 - alexcrichton:travis, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~13^2~47
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b890f3f44d7d266e3ed951f6beb884331c526049;p=cargo.git

Auto merge of #3171 - alexcrichton:travis, r=alexcrichton

Fix Travis OSX

They recently changed images, gotta tweak how we work with OpenSSL
---

b890f3f44d7d266e3ed951f6beb884331c526049