commit aac1e17f22acfc7338ec5290db55fbbfd8ddfdbf Merge: f68aab83b c28da0d8e Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 21 20:04:03 2018 -0400
Merge remote-tracking branch 'teor/travis-osx-034' into maint-0.3.4
.travis.yml | 276 ++++++++++++++++++++++++------------------- 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 | 7 +- 15 files changed, 195 insertions(+), 129 deletions(-)