commit 8dd89e433078245778924ce67403673e9d35a5c3 Merge: 0f39cc10f 66d5292ee Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 9 09:59:45 2020 -0400

Merge remote-tracking branch 'dgoulet/ticket33796_044_01' into maint-0.4.4

changes/ticket33796 | 7 +++++++ doc/tor.1.txt | 16 +++++++--------- src/app/config/config.c | 2 +- src/test/test_config.c | 2 -- 4 files changed, 15 insertions(+), 12 deletions(-)