[tor-commits] [tor/master] Merge remote-tracking branch 'teor/travis-osx-032' into maint-0.3.2

[nickm at torproject.org]

commit a29e9a901d196243791f9210be1fed1c177521df
Merge: d52f40600 e2eec40c4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 21 20:03:41 2018 -0400

    Merge remote-tracking branch 'teor/travis-osx-032' into maint-0.3.2

 .travis.yml                  | 253 ++++++++++++++++++++++++++-----------------
 changes/bug26497             |   3 +
 changes/bug26497-backport    |   3 +
 changes/bug27088             |   5 +
 changes/bug27090             |   3 +
 changes/bug27093             |   3 +
 changes/ticket24629          |   3 +
 changes/ticket26560          |   3 +
 changes/ticket26952-cargo    |   3 +
 changes/ticket26952-ccache   |   3 +
 changes/ticket27087          |   3 +
 src/rust/tor_util/include.am |   1 -
 src/test/test_rust.sh        |  17 ++-
 13 files changed, 194 insertions(+), 109 deletions(-)