Merge branch 'travis-osx-033' into travis-osx-034
commitc28da0d8e105515bafdb8a9710ab965a51b3c4eb
authorteor <teor@torproject.org>
Fri, 10 Aug 2018 09:06:45 +0000 (10 19:06 +1000)
committerteor <teor@torproject.org>
Fri, 10 Aug 2018 09:06:45 +0000 (10 19:06 +1000)
tree256c17136bfb3b2db393291c1e6191e99be43c32
parenta1c110a2a478d3fae50871741d52659cc34f4623
parent6463cdea55bbeb711a10153156a4b93f2471d034
Merge branch 'travis-osx-033' into travis-osx-034
.travis.yml