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

[dgoulet at torproject.org]

commit 6fce18916f8a58ad129c98710b44ae40928806cc
Merge: fc080b4113 b599f489ae
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed Mar 10 10:06:20 2021 -0500

    Merge branch 'tor-gitlab/mr/331'

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