From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 24 Apr 2018 14:38:37 +0000 (-0400)
Subject: Merge branch 'maint-0.2.9' into maint-0.3.1
X-Git-Tag: tor-0.3.2.11~32^2^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5cc3a0379eba0eb4e9baac97468fcaebcc654437;p=thirdparty%2Ftor.git

Merge branch 'maint-0.2.9' into maint-0.3.1
---

5cc3a0379eba0eb4e9baac97468fcaebcc654437
diff --cc .travis.yml
index bf55b7756a,6da3027b85..3f133782d1
--- a/.travis.yml
+++ b/.travis.yml
@@@ -95,10 -88,10 +95,12 @@@ matrix
    ## entry under that key outside the "include" clause.
    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