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

[teor at torproject.org]

commit 989909145cecf3d3fad5434ae0bf4790792ad414
Merge: df54cfcce 8d22c09ab
Author: teor <teor at torproject.org>
Date:   Thu Aug 8 11:05:01 2019 +1000

    Merge branch 'maint-0.2.9' into release-0.2.9

 .travis.yml         | 40 +++++++++++++++-------------------------
 changes/chutney_ci  |  3 +++
 changes/ticket30213 |  3 +++
 3 files changed, 21 insertions(+), 25 deletions(-)