commit 5ff42674e1c3d861a0ad128aea099293eda3c0f5 Merge: e05304902 42ea03eb7 Author: teor teor@torproject.org Date: Fri Mar 20 11:24:48 2020 +1000

Merge branch 'maint-0.4.1' into release-0.4.1

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