aboutsummaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2020-02-12 12:22:04 +1000
committerteor <teor@torproject.org>2020-02-12 12:22:04 +1000
commitff52205362f5d60c209f298a3e3679bc65bdf539 (patch)
tree9f5452a584a15cb605c12b5b7d27ce7f93e52579 /.travis.yml
parent00fe214729b935adc522883fa84b399429fefa74 (diff)
parent5298113da98f13cfaad4a9ab7b5ac8baa6c37279 (diff)
downloadtor-ff52205362f5d60c209f298a3e3679bc65bdf539.tar.gz
tor-ff52205362f5d60c209f298a3e3679bc65bdf539.zip
Merge branch 'maint-0.4.1' into maint-0.4.2
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml2
1 files changed, 0 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 368910f1f1..26c7b33cd7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -95,8 +95,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