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

[nickm at torproject.org]

commit 05d62a3b73ed092ec1643ead56d775bb5d06f648
Merge: 85a879234 d514e9866
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 21 20:03:19 2018 -0400

    Merge remote-tracking branch 'teor/travis-osx-029' into maint-0.2.9

 .travis.yml                | 213 ++++++++++++++++++++++++++-------------------
 changes/bug27088           |   5 ++
 changes/ticket24629        |   3 +
 changes/ticket26560        |   3 +
 changes/ticket26952-ccache |   3 +
 changes/ticket27087        |   3 +
 6 files changed, 140 insertions(+), 90 deletions(-)