tor

commit dcb8cad4e65022820c1660838e72b5b5ea67f850
parent a742a80eeaf12e238c5b2e9eb06d8edbc8797c2b
Author: teor <teor@torproject.org>
Date:   Tue, 11 Jun 2019 14:51:46 +1000

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

Diffstat:
M
.travis.yml
 | 
4
++++
A
changes/bug30744
 | 
3
+++

2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -70,6 +70,10 @@ 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-allow_failures
+  allow_failures:
+    ## test-stem sometimes hangs on Travis
+    - env: TEST_STEM="yes"
+
   exclude:
     ## gcc on OSX is less useful, because the default compiler is clang.
     - compiler: gcc
diff --git a/changes/bug30744 b/changes/bug30744
@@ -0,0 +1,3 @@
+  o Minor bugfixes (continuous integration):
+    - Allow the test-stem job to fail in Travis, because it sometimes hangs.
+      Fixes bug 30744; bugfix on 0.3.5.4-alpha.