commit d382f26914590623954ad2f20f1cc06a3733e6a8 Merge: 690c7be253 b599f489ae Author: David Goulet <dgoulet@torproject.org> Date: Wed Mar 10 10:06:44 2021 -0500 Merge branch 'tor-gitlab/mr/331' into maint-0.4.5 changes/bug40256_045 | 3 +++ doc/man/tor.1.txt | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-)