commit 6463cdea55bbeb711a10153156a4b93f2471d034 Merge: ed1210d0f e2eec40c4 Author: teor <teor@torproject.org> Date: Fri Aug 10 19:06:32 2018 +1000 Merge branch 'travis-osx-032' into travis-osx-033 .travis.yml | 1 + 1 file changed, 1 insertion(+)