[tor-commits] [tor] 04/04: Merge branch 'maint-0.4.7'

[gitolite role]

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

dgoulet pushed a commit to branch main
in repository tor.

commit 16664c00174e4766eb6bf509e79e4c43731e4365
Merge: ac306581af b2665ad639
Author: David Goulet <dgoulet at torproject.org>
AuthorDate: Tue Aug 9 11:01:44 2022 -0400

    Merge branch 'maint-0.4.7'

 changes/ticket40652                     | 10 ++++++
 doc/man/tor.1.txt                       | 26 +++++++++++++++
 src/feature/dirauth/dirauth_config.c    |  5 +++
 src/feature/dirauth/dirauth_options.inc | 25 +++++++++++++++
 src/feature/dirauth/voteflags.c         | 56 +++++++++++++++++----------------
 5 files changed, 95 insertions(+), 27 deletions(-)


-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.