commit f7dc920f4ba6c025c9162a2d1894672686f11ef2 Merge: 5303dbe62 c541258fa Author: David Goulet dgoulet@torproject.org Date: Tue Jul 23 09:39:51 2019 -0400

Merge branch 'maint-0.4.1'

.travis.yml | 24 +++++++++++++++++------- changes/chutney_ci | 3 +++ 2 files changed, 20 insertions(+), 7 deletions(-)

diff --cc .travis.yml index fe34fac25,1049a3c54..b5ec7e0cd --- 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