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

[teor at torproject.org]

commit 84b84b24309ba1f9b51481eea847003c1dc4b1f3
Merge: 4b4479773 1bc2ae7be
Author: teor <teor at torproject.org>
Date:   Thu Aug 8 11:11:22 2019 +1000

    Merge branch 'maint-0.3.5' into release-0.3.5

 .travis.yml        | 25 +++++++++++++++++++------
 changes/chutney_ci |  3 +++
 2 files changed, 22 insertions(+), 6 deletions(-)