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