commit eb2d08a72c165ee941607c1b2cc591fb4b5e631b Merge: 725efb7c9 3aa855dc6 Author: teor teor@torproject.org Date: Fri Mar 20 11:24:57 2020 +1000

Merge branch 'maint-0.4.2' into maint-0.4.3

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