[tor-commits] [tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/1157' into maint-0.4.0

[teor at torproject.org]

commit 97e7be2717290d0d085be74aa59006d0b783b6ec
Merge: 2a42d6be2 7b05f1980
Author: teor <teor at torproject.org>
Date:   Thu Aug 8 11:07:34 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/1157' into maint-0.4.0

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