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

[teor at torproject.org]

commit e5bce3a74eddf7a55f357664629b520ff3b6c05d
Merge: f33d5b29e 400e31ad1
Author: teor <teor at torproject.org>
Date:   Thu Oct 17 14:52:10 2019 +1000

    Merge branch 'maint-0.4.1' into release-0.4.1

 .travis.yml         | 87 +++++++++++++++++++++++------------------------------
 changes/ticket30860 |  3 ++
 changes/ticket31859 |  3 ++
 3 files changed, 43 insertions(+), 50 deletions(-)