[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3

[ahf at torproject.org]

commit 9b654b95ec908ecddea4202f648f8b139ef6b7ab
Merge: a211f54749 2e7cbd7a9c
Author: Alexander Færøy <ahf at torproject.org>
Date:   Thu Nov 19 17:43:59 2020 +0000

    Merge branch 'maint-0.4.3' into release-0.4.3

 changes/bug40179_part2 | 4 ++++
 src/test/test_config.c | 6 ++++--
 2 files changed, 8 insertions(+), 2 deletions(-)