This is an automated email from the git hooks/post-receive script.
dgoulet pushed a commit to branch main in repository tor.
commit 4f038d224f5a3df5fb396eff0173bba0eec89127 Merge: bae04e6a98 96f1e69f24 Author: David Goulet dgoulet@torproject.org AuthorDate: Mon May 16 08:51:00 2022 -0400
Merge branch 'tor-gitlab/mr/489'
changes/prop275 | 12 ++++++++++ src/feature/dirauth/dirvote.c | 36 +++++++++++++++++++++-------- src/feature/dirauth/dirvote.h | 8 ++++++- src/feature/dirparse/ns_parse.c | 5 +++- src/feature/nodelist/fmt_routerstatus.c | 16 +++++++++++-- src/feature/nodelist/fmt_routerstatus.h | 3 ++- src/feature/nodelist/networkstatus.c | 9 ++------ src/feature/nodelist/routerlist.c | 19 +++++++-------- src/feature/nodelist/routerstatus_st.h | 1 - src/feature/nodelist/vote_routerstatus_st.h | 1 + src/feature/relay/router.c | 2 -- src/test/test_dir.c | 23 +++++++++--------- src/test/test_dir_common.c | 8 +++---- src/test/test_nodelist.c | 8 ++----- src/test/test_router.c | 14 +---------- src/test/test_voting_flags.c | 4 ---- 16 files changed, 96 insertions(+), 73 deletions(-)