commit f1c673fa545dc4fc9003b3fe2170d7fd42870a18 Merge: 0cf3ab54f6 3a2593710b Author: George Kadianakis desnacked@riseup.net Date: Wed Mar 24 13:17:27 2021 +0200

Merge remote-tracking branch 'tor-gitlab/mr/343'

changes/ticket40346 | 4 ++++ doc/man/tor.1.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)