commit 44aa586dea7d8fb4a7db2d0beae46a0c3ae7589b Merge: 93ff1870b f0230ee38 Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 17 10:48:18 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

.travis.yml | 9 ++++++++- changes/coveralls | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-)

diff --cc .travis.yml index 27534e4cf,bf55b7756..3d61f5a61 --- a/.travis.yml +++ b/.travis.yml @@@ -97,9 -96,9 +97,11 @@@ matrix include: - compiler: gcc - compiler: gcc + env: RUST_OPTIONS="--enable-rust" TOR_RUST_DEPENDENCIES=true + - compiler: gcc env: RUST_OPTIONS="" + - compiler: gcc + env: COVERAGE_OPTIONS="--enable-coverage" ## 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