From: David Goulet <dgoulet@torproject.org>
Date: Tue, 23 Jul 2019 13:39:51 +0000 (-0400)
Subject: Merge branch 'maint-0.4.1'
X-Git-Tag: tor-0.4.2.1-alpha~133
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f7dc920f4ba6c025c9162a2d1894672686f11ef2;p=thirdparty%2Ftor.git

Merge branch 'maint-0.4.1'
---

f7dc920f4ba6c025c9162a2d1894672686f11ef2
diff --cc .travis.yml
index fe34fac255,1049a3c54b..b5ec7e0cdf
--- a/.travis.yml
+++ b/.travis.yml
@@@ -189,12 -195,10 +195,14 @@@ install
    - if [[ "$RUST_OPTIONS" != "" ]]; then cargo --version; fi
    ## Get python version
    - python --version
-   ## run stem tests if they are enabled.
+   ## If we're running chutney, show the chutney commit
+   - if [[ "$CHUTNEY" != "" ]]; then pushd "$CHUTNEY_PATH"; git log -1 ; popd ; fi
+   ## If we're running stem, show the stem version and commit
    - if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import stem; print(stem.__version__);"; git log -1; popd; fi
 +  ## We don't want Tor tests to depend on default configuration file at
 +  ## ~/.torrc. So we put some random bytes in there, to make sure we get build
 +  ## failures in case Tor is reading it during CI jobs.
 +  - dd ibs=1 count=1024 if=/dev/urandom > ~/.torrc
  
  script:
    # Skip test_rebind on macOS