commit ff38a077e108cc04f9638db4b5e3ecdfa3dd5bcb Merge: 781dd1bd8 8dd89e433 Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 9 09:59:54 2020 -0400

Merge branch 'maint-0.4.4' into release-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(-)