commit 2e7cbd7a9c4672d334a5900be2d2f4be26e603a3 Merge: 7c0778ef7e 4154158d79 Author: Alexander Færøy <ahf@torproject.org> Date: Thu Nov 19 17:43:44 2020 +0000 Merge remote-tracking branch 'tor-gitlab/mr/196' into maint-0.4.3 changes/bug40179_part2 | 4 ++++ src/test/test_config.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)