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

[teor at torproject.org]

commit 015d5152fa78c5f1dda3953214d56893e8a3d111
Merge: 58378c27e 9ef8f5d1b
Author: teor <teor at torproject.org>
Date:   Mon Mar 16 20:54:30 2020 +1000

    Merge branch 'maint-0.4.2' into release-0.4.2

 .travis.yml         | 2 +-
 changes/ticket32792 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)