[tor-commits] [tor/master] Merge remote-tracking branch 'teor/travis-osx-master'

[nickm@xxxxxxxxxxxxxx]

commit bf5704051c018dbd0ba0a4dd09904efe521fab62
Merge: de66bd397 00e4a7077
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Aug 21 20:04:13 2018 -0400

    Merge remote-tracking branch 'teor/travis-osx-master'

 .travis.yml                  | 273 ++++++++++++++++++++++++-------------------
 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/ticket26952-cargo    |   3 +
 changes/ticket26952-ccache   |   3 +
 changes/ticket27087          |   3 +
 src/rust/tor_rust/include.am |   2 -
 src/test/test_rust.sh        |   5 +-
 14 files changed, 189 insertions(+), 127 deletions(-)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits