From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 17 Apr 2018 14:48:18 +0000 (-0400)
Subject: Merge branch 'maint-0.3.2' into maint-0.3.3
X-Git-Tag: tor-0.3.3.6~39^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=44aa586dea7d8fb4a7db2d0beae46a0c3ae7589b;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.2' into maint-0.3.3
---

44aa586dea7d8fb4a7db2d0beae46a0c3ae7589b
diff --cc .travis.yml
index 27534e4cfe,bf55b7756a..3d61f5a61a
--- a/.travis.yml
+++ b/.travis.yml
@@@ -96,10 -95,10 +96,12 @@@ matrix
    ## entry under that key outside the "include" clause.
    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