commit c8447f95ec202bff9d99941dcdf0dca91e0edc3f Merge: 430dd2da6 d761c3ca6 Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 10 18:44:20 2019 -0400

Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.4.0

.travis.yml | 4 ++++ changes/bug30744 | 3 +++ 2 files changed, 7 insertions(+)

diff --cc .travis.yml index 30e6d9a6b,a1a48baff..7d8877c2a --- a/.travis.yml +++ b/.travis.yml @@@ -70,7 -70,17 +70,11 @@@ matrix ## Careful! We use global envs, which makes it hard to exclude or ## allow failures by env: ## https://docs.travis-ci.com/user/customizing-the-build#matching-jobs-with-all... + allow_failures: + ## test-stem sometimes hangs on Travis + - env: TEST_STEM="yes" + exclude: - ## Clang doesn't work in containerized builds, see below. - - compiler: clang - sudo: false - ## Non-containerized gcc are slow and redundant. - - compiler: gcc - sudo: required ## gcc on OSX is less useful, because the default compiler is clang. - compiler: gcc os: osx