[tor-commits] [tor/master] Merge branch 'tor-gitlab/mr/342'

[dgoulet at torproject.org]

commit 35b601a8b5f3d0da989d93a28b585ee570f680fd
Merge: 5c7f9844e4 ed7081ae2e
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Mar 23 08:19:02 2021 -0400

    Merge branch 'tor-gitlab/mr/342'

 doc/man/tor.1.txt | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)