[tor-commits] [tor] 05/07: Merge remote-tracking branch 'tor-gitlab/mr/590'

[gitolite role <git@xxxxxxxxxxxxxxxxxxxxx>]

This is an automated email from the git hooks/post-receive script.

nickm pushed a commit to branch main
in repository tor.

commit 1ecd7c5d437a2285a5b3d05988645f3f74e78547
Merge: 834745929a 95080794eb
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
AuthorDate: Thu Jul 21 15:19:20 2022 -0400

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

 doc/man/tor.1.txt                   | 4 ++--
 scripts/maint/checkOptionDocs.pl.in | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits