Unverified Commit dcb8cad4 authored by teor's avatar teor
Browse files

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

parents a742a80e d761c3ca

.travis.yml

+4 −0
Original line number Diff line number Diff line
@@ -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

changes/bug30744

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  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.