[tor-commits] [tor] 03/04: Merge branch 'tor-gitlab/mr/635' into 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 0a49e04691b6f6efedadc003521cd0e5809f81da
Merge: 59008c6f51 bab8375ef5
Author: David Goulet <dgoulet at torproject.org>
AuthorDate: Wed Oct 26 15:01:40 2022 -0400

    Merge branch 'tor-gitlab/mr/635' into maint-0.4.7

 changes/bug40698                        | 11 +++++++++++
 src/feature/dirauth/dirauth_options.inc |  3 ---
 src/feature/dirauth/dirvote.c           |  3 +--
 src/feature/nodelist/fmt_routerstatus.c | 15 +++++++++++++--
 4 files changed, 25 insertions(+), 7 deletions(-)

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