diff options
| author | David Goulet <dgoulet@torproject.org> | 2020-10-27 10:18:16 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2020-10-27 10:18:16 -0400 |
| commit | 26cfac18803ae1eb9f449d563842347f4d9340f9 (patch) | |
| tree | d6078b193e19e0717afacf804711c6973f6aab4d | |
| parent | c1bcc1da038c5e70f2bdecc6296605d238db448c (diff) | |
| parent | fd58e74ddcb012892bd7e59ef1587fc4faa2ab35 (diff) | |
| download | tor-26cfac18803ae1eb9f449d563842347f4d9340f9.tar.gz tor-26cfac18803ae1eb9f449d563842347f4d9340f9.zip | |
Merge branch 'tor-gitlab/mr/176' into maint-0.4.4
| -rw-r--r-- | changes/ticket40162 | 7 | ||||
| -rw-r--r-- | src/feature/dirauth/dirvote.h | 52 |
2 files changed, 47 insertions, 12 deletions
diff --git a/changes/ticket40162 b/changes/ticket40162 new file mode 100644 index 0000000000..093042f9af --- /dev/null +++ b/changes/ticket40162 @@ -0,0 +1,7 @@ + o Minor features (authorities): + - Authorities now list a different set of protocols as required and + recommended. These lists are chosen so that only truly recommended + and/or required protocols are included, and so that clients using 0.2.9 + or later will continue to work (even though they are not supported), + whereas only relays running 0.3.5 or later will meet the requirements. + Closes ticket 40162. diff --git a/src/feature/dirauth/dirvote.h b/src/feature/dirauth/dirvote.h index 1b1c9f2cc7..a9b356b387 100644 --- a/src/feature/dirauth/dirvote.h +++ b/src/feature/dirauth/dirvote.h @@ -238,32 +238,60 @@ STATIC microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri, /** 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=1-2 Desc=1-2 DirCache=2 HSDir=2 HSIntro=4 HSRend=2 " \ - "Link=5 LinkAuth=3 Microdesc=1-2 Relay=2" +#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=1-2 Desc=1-2 DirCache=2 HSDir=2 HSIntro=4 HSRend=2 " \ - "Link=5 LinkAuth=3 Microdesc=1-2 Relay=2" +#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=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " \ - "Link=3-4 Microdesc=1 Relay=1-2" +#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=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " \ - "Link=4 Microdesc=1-2 Relay=2" +#define DIRVOTE_REQUIRE_CLIENT_PROTO \ + "Cons=2 " \ + "Desc=2 " \ + "Link=4 " \ + "Microdesc=2 " \ + "Relay=2" #endif /* defined(DIRVOTE_PRIVATE) */ |