commit c28da0d8e105515bafdb8a9710ab965a51b3c4eb Merge: a1c110a2a 6463cdea5 Author: teor <teor@torproject.org> Date: Fri Aug 10 19:06:45 2018 +1000 Merge branch 'travis-osx-033' into travis-osx-034 .travis.yml | 1 + 1 file changed, 1 insertion(+)