commit 77b265f96ee65871ae7ed3f54642878116c65ff4 Merge: fb6bba1e42 a7fe37f1fa Author: David Goulet dgoulet@torproject.org Date: Fri Nov 5 10:44:10 2021 -0400
Merge branch 'maint-0.4.5' into maint-0.4.6
src/core/or/protover.c | 105 +++++++++++++++++++++++++++++++++++++++++- src/core/or/protover.h | 4 ++ src/feature/dirauth/dirvote.c | 12 ++--- src/feature/dirauth/dirvote.h | 58 ----------------------- src/test/test_protover.c | 8 ++-- 5 files changed, 117 insertions(+), 70 deletions(-)
diff --cc src/feature/dirauth/dirvote.h index d6a2d9cc75,81a7733e8c..3420098315 --- a/src/feature/dirauth/dirvote.h +++ b/src/feature/dirauth/dirvote.h @@@ -264,68 -259,7 +264,10 @@@ STATI char *networkstatus_get_detached_signatures(smartlist_t *consensuses); STATIC microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri, int consensus_method); +STATIC int64_t extract_param_buggy(const char *params, + const char *param_name, + int64_t default_value);
- /** The recommended relay protocols for this authority's votes. - * Recommending a new protocol causes old tor versions to log a warning. - */ - #define DIRVOTE_RECOMMEND_RELAY_PROTO \ - "Cons=2 " \ - "Desc=2 " \ - "DirCache=2 " \ - "HSDir=2 " \ - "HSIntro=4 " \ - "HSRend=2 " \ - "Link=4-5 " \ - "LinkAuth=3 " \ - "Microdesc=2 " \ - "Relay=2" - - /** The recommended client protocols for this authority's votes. - * Recommending a new protocol causes old tor versions to log a warning. - */ - #define DIRVOTE_RECOMMEND_CLIENT_PROTO \ - "Cons=2 " \ - "Desc=2 " \ - "DirCache=2 " \ - "HSDir=2 " \ - "HSIntro=4 " \ - "HSRend=2 " \ - "Link=4-5 " \ - "Microdesc=2 " \ - "Relay=2" - - /** The required relay protocols for this authority's votes. - * WARNING: Requiring a new protocol causes old tor versions to shut down. - * Requiring the wrong protocols can break the tor network. - * See Proposal 303: When and how to remove support for protocol versions. - */ - #define DIRVOTE_REQUIRE_RELAY_PROTO \ - "Cons=2 " \ - "Desc=2 " \ - "DirCache=2 " \ - "HSDir=2 " \ - "HSIntro=4 " \ - "HSRend=2 " \ - "Link=4-5 " \ - "LinkAuth=3 " \ - "Microdesc=2 " \ - "Relay=2" - - /** The required relay protocols for this authority's votes. - * WARNING: Requiring a new protocol causes old tor versions to shut down. - * Requiring the wrong protocols can break the tor network. - * See Proposal 303: When and how to remove support for protocol versions. - */ - #define DIRVOTE_REQUIRE_CLIENT_PROTO \ - "Cons=2 " \ - "Desc=2 " \ - "Link=4 " \ - "Microdesc=2 " \ - "Relay=2" - #endif /* defined(DIRVOTE_PRIVATE) */
#endif /* !defined(TOR_DIRVOTE_H) */