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

[teor at torproject.org]

commit f141b861a891f7c1ee70e4e53f8b44a060161810
Merge: 5c68a74ed c96cf1494
Author: teor <teor at torproject.org>
Date:   Fri Mar 13 13:01:19 2020 +1000

    Merge branch 'maint-0.4.1' into release-0.4.1

 .travis.yml         | 57 ++++++++++++++++++++++++++++++++---------------------
 changes/ticket33194 |  4 ++++
 changes/ticket33195 |  4 ++++
 3 files changed, 42 insertions(+), 23 deletions(-)