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

[teor at torproject.org]

commit aed3a3f7955ee83c6aae92843619baaaeb201cfa
Merge: 96a8773f0 3aa855dc6
Author: teor <teor at torproject.org>
Date:   Fri Mar 20 11:24:54 2020 +1000

    Merge branch 'maint-0.4.2' into release-0.4.2

 .appveyor.yml             |  2 +-
 changes/ticket33643       |  5 +++++
 changes/ticket33643_part2 |  3 +++
 src/test/testing_common.c | 15 +++++++++++++++
 4 files changed, 24 insertions(+), 1 deletion(-)