commit ae05f06597364f5af20254ab8cf36c65591e59d9 Merge: d320f4d2a2 54ab43d05e Author: Alexander Færøy ahf@torproject.org Date: Thu Oct 21 12:57:37 2021 +0000

Merge branch 'tor-gitlab/mr/452_squashed' into main

changes/prop335 | 11 +++++++ doc/man/tor.1.txt | 29 +++++++++++++----- src/app/config/config.c | 3 ++ src/app/config/or_options_st.h | 4 +++ src/core/or/policies.c | 22 ++++++++++++++ src/core/or/policies.h | 1 + src/feature/dirauth/dirauth_options.inc | 4 +++ src/feature/dirauth/dirvote.c | 52 +++++++++++++++++++++++++++++---- src/feature/dirauth/dirvote.h | 6 +++- src/feature/dirauth/process_descs.c | 15 ++++++++++ src/feature/dirauth/process_descs.h | 3 +- src/feature/dirauth/voteflags.c | 11 ++++++- src/feature/dirauth/voteflags.h | 3 +- src/feature/dirparse/ns_parse.c | 2 ++ src/feature/nodelist/fmt_routerstatus.c | 3 +- src/feature/nodelist/node_st.h | 2 ++ src/feature/nodelist/routerstatus_st.h | 2 ++ src/test/test_voting_flags.c | 3 +- 18 files changed, 158 insertions(+), 18 deletions(-)