From: teor <teor@torproject.org>
Date: Tue, 11 Jun 2019 04:51:46 +0000 (+1000)
Subject: Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.3.5
X-Git-Tag: tor-0.3.5.9~34^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dcb8cad4e65022820c1660838e72b5b5ea67f850;p=thirdparty%2Ftor.git

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

dcb8cad4e65022820c1660838e72b5b5ea67f850
diff --cc .travis.yml
index 3c0a3a02a8,a1a48baffe..861b37f085
--- 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-allow_failures
+   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