mirror/tor
0
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 04:12:13 +02:00
Code

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

Browse Source
This commit is contained in:
teor 2019-06-11 14:51:46 +10:00
commit dcb8cad4e6
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -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

3
changes/bug30744 Normal file
View File

@ -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.