commit 2c10cc3080f61df2aadfc1bb1eebcfd1d0e34350 Merge: 17ceeb7f92 515ccc4a42 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Sep 16 08:53:28 2021 -0400 Merge remote-tracking branches 'tor-gitlab/mr/439' and 'tor-gitlab/mr/441' doc/man/tor.1.txt | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)