commit 9bc0306b8c8675472a6335e9dc1c0a90438444f8 Merge: 6ce2550468 b274e46309 Author: Alexander Færøy <ahf@torproject.org> Date: Thu Nov 19 17:44:00 2020 +0000 Merge branch 'maint-0.4.5' changes/bug40179_part2 | 4 ++++ src/test/test_config.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)