[tor-commits] [tor/maint-0.3.3] Merge branch 'travis-osx-032' into travis-osx-033

[nickm at torproject.org]

commit 2b9dd0f9c0247d1723d1508b03d7a0ec0790eb27
Merge: c4d0d9bd2 4517c4c3e
Author: teor <teor at torproject.org>
Date:   Fri Aug 10 11:43:17 2018 +1000

    Merge branch 'travis-osx-032' into travis-osx-033
    
    Replace 033 .travis.yml with 032 .travis.yml.
    Subsequent commits will restore 033 functionality.
    
    src/rust/tor_util/include.am is deleted in 033.
    Subsequent commits will apply 032 changes to
    src/rust/tor_rust/include.am.
    
    Replace 033 src/test/test_rust.sh with 032
    src/test/test_rust.sh, which was backported from
    master.

 .travis.yml                | 260 ++++++++++++++++++++++++++-------------------
 changes/bug26497           |   3 +
 changes/bug26497-backport  |   3 +
 changes/bug27088           |   5 +
 changes/bug27090           |   3 +
 changes/bug27093           |   3 +
 changes/ticket26560        |   3 +
 changes/ticket26952-cargo  |   3 +
 changes/ticket26952-ccache |   3 +
 changes/ticket27087        |   3 +
 src/test/test_rust.sh      |   6 +-
 11 files changed, 179 insertions(+), 116 deletions(-)