[tor-commits] [tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0

[teor at torproject.org]

commit cac910c42d35233df6983869349f358b0ae1aabc
Merge: 56fdd4f16 e27a74b1b
Author: teor <teor at torproject.org>
Date:   Thu Aug 8 11:11:31 2019 +1000

    Merge branch 'maint-0.4.0' into release-0.4.0

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