[tor-commits] [tor/master] Merge branch 'tor-github/pr/1158' into maint-0.4.1

[dgoulet at torproject.org]

commit c541258fac5544ea3319e6e8e8c712fd70a76cfd
Merge: 5e1660100 7541aaf98
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Jul 23 09:39:43 2019 -0400

    Merge branch 'tor-github/pr/1158' into maint-0.4.1

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