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

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

dgoulet pushed a commit to branch main in repository tor.

commit ca135a127d3641dde301eb7dfa4f50edce878a0e Merge: 1720744904 0a49e04691 Author: David Goulet dgoulet@torproject.org AuthorDate: Wed Oct 26 15:01:43 2022 -0400

Merge branch '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(-)