[tor-commits] [tor/maint-0.4.5] Merge branch 'maint-0.4.4' into maint-0.4.5

[ahf at torproject.org]

commit b274e46309b4375f6014f3b698ea24b32d4935a5
Merge: ea52705e4b 77bb4b0838
Author: Alexander Færøy <ahf at torproject.org>
Date:   Thu Nov 19 17:44:00 2020 +0000

    Merge branch 'maint-0.4.4' into maint-0.4.5

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