commit 38cf52b0238bd95893935936cd5925d176c5bbb8 Merge: 8e68fe7e1 fa9a0cc1f Author: teor teor@torproject.org Date: Thu Aug 9 22:20:29 2018 +1000

Merge branch 'travis-osx-029' into travis-osx-032

Replace 032 .travis.yml with 029 .travis.yml. Subsequent commits will restore 032 functionality.

.travis.yml | 227 ++++++++++++++++++++++++--------------------- changes/bug27088 | 5 + changes/ticket26560 | 3 + changes/ticket26952-ccache | 3 + changes/ticket27087 | 3 + 5 files changed, 133 insertions(+), 108 deletions(-)