Merge branch 'maint-0.4.1'

diff --cc .travis.yml
index fe34fac2559649d0a00932788fc7545d66f05cc2,1049a3c54b8dd37c45c480b083b06d0561e7845e..b5ec7e0cdfeaf50c495efdca9d03f68548a33345
--- 1/.travis.yml
--- 2/.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