[tor-commits] [tor] branch main updated (1720744904 -> ca135a127d)

[gitolite role]

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

dgoulet pushed a change to branch main
in repository tor.

    from 1720744904 Merge branch 'maint-0.4.7'
     new ea2ba4f5a8 back out most of commit b7992d4f
     new bab8375ef5 dir auths now omit Measured= if rs->is_authority
     new 0a49e04691 Merge branch 'tor-gitlab/mr/635' into maint-0.4.7
     new ca135a127d Merge branch 'maint-0.4.7'

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 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(-)
 create mode 100644 changes/bug40698

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