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

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

ce8e7427b9284ef12b69d50d72c8fc315b90e36d
diff --cc .travis.yml
index 0c01884106,dc0a8ac67a..bf55b7756a
--- a/.travis.yml
+++ b/.travis.yml
@@@ -95,8 -88,8 +95,10 @@@ matrix
    ## entry under that key outside the "include" clause.
    include:
      - compiler: gcc
 +    - 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
@@@ -111,7 -101,8 +113,8 @@@ before_install
    ## If we're on OSX, homebrew usually needs to updated first
    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update ; fi
    ## Download rustup
 -  - curl -Ssf -o rustup.sh https://sh.rustup.rs
 +  - if [[ "$RUST_OPTIONS" != "" ]]; then curl -Ssf -o rustup.sh https://sh.rustup.rs; fi
+   - if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi
  
  install:
    ## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above)