commit 5cc3a0379eba0eb4e9baac97468fcaebcc654437
Merge: e88863407 34e7dca9c
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Tue Apr 24 10:38:37 2018 -0400
Merge branch 'maint-0.2.9' into maint-0.3.1
.travis.yml | 5 ++++-
changes/travis_distcheck | 4 ++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --cc .travis.yml
index bf55b7756,6da3027b8..3f133782d
--- a/.travis.yml
+++ b/.travis.yml
@@@ -96,9 -89,9 +96,11 @@@ matrix
include:
- compiler: gcc
- compiler: gcc
+ env: RUST_OPTIONS=""
+ - compiler: gcc
env: COVERAGE_OPTIONS="--enable-coverage"
+ - compiler: gcc
+ env: DISTCHECK="yes"
## The "sudo: required" forces non-containerized builds, working
## around a Travis CI environment issue: clang LeakAnalyzer fails
## because it requires ptrace and the containerized environment no