commit 00e4a707745d1faf4501e71be822042d5b5477f0 Merge: 4e6d754f3 c28da0d8e Author: teor <teor@torproject.org> Date: Fri Aug 10 19:07:02 2018 +1000 Merge branch 'travis-osx-034' into travis-osx-master .travis.yml | 1 + 1 file changed, 1 insertion(+)