summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-06-20 20:01:08 -0400
committerNick Mathewson <nickm@torproject.org>2018-06-20 20:01:08 -0400
commitbfbeb55469b2fa59f7488acf64f2b300a7bac0fe (patch)
tree6a82402239196f2bed3e9473a9f3c233e530a52b
parentf24797a5870b685af98728002a0b0da73f582fda (diff)
parent46dca273214147233808bcddb82c8bf76e8d6db5 (diff)
downloadtor-bfbeb55469b2fa59f7488acf64f2b300a7bac0fe.tar.gz
tor-bfbeb55469b2fa59f7488acf64f2b300a7bac0fe.zip
Merge branch 'maint-0.3.4'
-rw-r--r--.travis.yml5
1 files changed, 3 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index aab6f6b3d5..f37f9a23ff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -87,8 +87,9 @@ matrix:
## branches and build history pages. See
## https://github.com/travis-ci/travis-ci/issues/8716
allow_failures:
- # - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true
- # - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode
+ - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true
+ - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"
+ - env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"
# - compiler: clang
## Create explicit matrix entries to work around a Travis CI