commit 77bb4b0838da1d1c1cb7d2d47b02954abeb00a21 Merge: 9001732394 2e7cbd7a9c Author: Alexander Færøy <ahf@torproject.org> Date: Thu Nov 19 17:43:59 2020 +0000 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/bug40179_part2 | 4 ++++ src/test/test_config.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)