[tor-commits] [tor/master] Merge branch 'travis_distcheck_029' into travis_distcheck_031

[nickm at torproject.org]

commit 96bc96ceeb8e30868bbb0c6493ea142dc23af34b
Merge: ce8e7427b 612513371
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 18 17:35:41 2018 -0400

    Merge branch 'travis_distcheck_029' into travis_distcheck_031

 .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