diff options
author | teor <teor@torproject.org> | 2020-02-12 12:21:57 +1000 |
---|---|---|
committer | teor <teor@torproject.org> | 2020-02-12 12:21:57 +1000 |
commit | 5298113da98f13cfaad4a9ab7b5ac8baa6c37279 (patch) | |
tree | a85d0e8f6be3c4195f538592718d7c7ef5e2b612 /.travis.yml | |
parent | 0ff3e8f4a0fd5b661e999c0a81ceb1c55e7456c6 (diff) | |
parent | b9c7c61ea5233854ff83257a8bc530b7e0a50351 (diff) | |
download | tor-5298113da98f13cfaad4a9ab7b5ac8baa6c37279.tar.gz tor-5298113da98f13cfaad4a9ab7b5ac8baa6c37279.zip |
Merge branch 'maint-0.3.5' into maint-0.4.1
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 375796799b..6cfc4e51fd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -93,8 +93,6 @@ matrix: os: osx - env: CHUTNEY="yes" CHUTNEY_ALLOW_FAILURES="2" SKIP_MAKE_CHECK="yes" os: osx - ## test-stem sometimes hangs on Travis - - env: TEST_STEM="yes" SKIP_MAKE_CHECK="yes" ## (Linux only) Use a recent Linux image (Ubuntu Bionic) dist: bionic |