Merge branch 'maint-0.3.4'

This commit is contained in:
Nick Mathewson 2018-06-20 20:01:08 -04:00
commit bfbeb55469

View File

@ -87,8 +87,9 @@ matrix:
## branches and build history pages. See ## branches and build history pages. See
## https://github.com/travis-ci/travis-ci/issues/8716 ## https://github.com/travis-ci/travis-ci/issues/8716
allow_failures: allow_failures:
# - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true - env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true
# - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode - env: RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"
- env: DISTCHECK="yes" RUST_OPTIONS="--enable-rust --enable-cargo-online-mode"
# - compiler: clang # - compiler: clang
## Create explicit matrix entries to work around a Travis CI ## Create explicit matrix entries to work around a Travis CI