[tor-commits] [tor/maint-0.3.3] Merge remote-tracking branch 'teor/travis-osx-033' into maint-0.3.3

[nickm at torproject.org]

commit f0633bc49164a10ca163aa94139222682af376f7
Merge: 245025a3d 6463cdea5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 21 20:03:56 2018 -0400

    Merge remote-tracking branch 'teor/travis-osx-033' into maint-0.3.3

 .travis.yml                  | 262 +++++++++++++++++++++++++------------------
 changes/bug26497             |   3 +
 changes/bug26497-backport    |   3 +
 changes/bug26497-cd          |   4 +
 changes/bug27088             |   5 +
 changes/bug27090             |   3 +
 changes/bug27093             |   3 +
 changes/ticket24629          |   3 +
 changes/ticket24629-backport |   3 +
 changes/ticket26560          |   3 +
 changes/ticket26952-cargo    |   3 +
 changes/ticket26952-ccache   |   3 +
 changes/ticket27087          |   3 +
 src/rust/tor_rust/include.am |   2 -
 src/test/test_rust.sh        |   6 +-
 15 files changed, 191 insertions(+), 118 deletions(-)