commit 42253014441e1ad538c72631250f43f258ff4c08 Merge: 3a86a4fe6 eb2d08a72 Author: teor teor@torproject.org Date: Fri Mar 20 11:25:01 2020 +1000

Merge branch 'maint-0.4.3' into release-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(-)