commit 456337a8dd52085c4a8647ceb2b74f40fde20934 Merge: 72e4ed863 f6efb3a18 Author: teor teor@torproject.org Date: Thu Apr 9 11:07:47 2020 +1000

Merge branch 'maint-0.4.3' into release-0.4.3

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