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

[teor at torproject.org]

commit 5cafb3364f739ceafcd5abeac93c38763b76d6ec
Merge: 557bc747f f021389e9
Author: teor <teor at torproject.org>
Date:   Fri Mar 13 13:01:22 2020 +1000

    Merge branch 'maint-0.4.2' into release-0.4.2

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