[tor-commits] [tor/master] Merge branch 'travis-osx-034' into travis-osx-master

[nickm at torproject.org]

commit 4e6d754f3537fdfab871cbea48000b396a7b5dec
Merge: 19038ff4b a1c110a2a
Author: teor <teor at torproject.org>
Date:   Fri Aug 10 16:42:13 2018 +1000

    Merge branch 'travis-osx-034' into travis-osx-master

 .travis.yml | 1 +
 1 file changed, 1 insertion(+)