commit 8c4581865e5fccf25a3ce78c8175a73bbb1ec7f5 Merge: c1b43d79eb d382f26914 Author: David Goulet dgoulet@torproject.org Date: Wed Mar 10 10:06:48 2021 -0500

Merge branch 'maint-0.4.5' into release-0.4.5

changes/bug40256_045 | 3 +++ doc/man/tor.1.txt | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-)