tor

commit 5b07ff40112390518d95caa90447cd5faf938cf7
parent 6a72cc25983850fb23bd21adb181b38c0ead2c5a
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon, 10 Jun 2019 18:44:31 -0400

Merge branch 'maint-0.4.0' into maint-0.4.1

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.