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

[nickm at torproject.org]

commit 048714d2ceab0d4658f0d11c50c6fd57f042e1ed
Merge: 3aa855dc6 26fd31fef
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 25 10:56:27 2020 -0400

    Merge branch 'maint-0.4.1' into maint-0.4.2

 .appveyor.yml    | 16 ++++++++++++++--
 changes/bug33673 |  6 ++++++
 2 files changed, 20 insertions(+), 2 deletions(-)