[tor-commits] [tor/release-0.4.1] Merge branch 'chutney_ci_v4_040' into chutney_ci_v4_041

[dgoulet at torproject.org]

commit 7541aaf988182d37addb07645f144dae7f3a0443
Merge: 3ccf91027 7b05f1980
Author: teor <teor at torproject.org>
Date:   Mon Jul 1 14:36:53 2019 +1000

    Merge branch 'chutney_ci_v4_040' into chutney_ci_v4_041

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