nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tor-gitlab/mr/176' into maint-0.4.4

Browse Source
This commit is contained in:
David Goulet 2020-10-27 10:18:16 -04:00
commit 26cfac1880
2 changed files with 47 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
changes/ticket40162 Normal file
View File

@ -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.

52
src/feature/dirauth/dirvote.h
View File

@ -238,32 +238,60 @@ STATIC microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri,
/** The recommended relay protocols for this authority's votes. /** The recommended relay protocols for this authority's votes.
* Recommending a new protocol causes old tor versions to log a warning. * Recommending a new protocol causes old tor versions to log a warning.
*/ */
#define DIRVOTE_RECOMMEND_RELAY_PROTO \ #define DIRVOTE_RECOMMEND_RELAY_PROTO \
"Cons=1-2 Desc=1-2 DirCache=2 HSDir=2 HSIntro=4 HSRend=2 " \ "Cons=2 " \
"Link=5 LinkAuth=3 Microdesc=1-2 Relay=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. /** The recommended client protocols for this authority's votes.
* Recommending a new protocol causes old tor versions to log a warning. * Recommending a new protocol causes old tor versions to log a warning.
*/ */
#define DIRVOTE_RECOMMEND_CLIENT_PROTO \ #define DIRVOTE_RECOMMEND_CLIENT_PROTO \
"Cons=1-2 Desc=1-2 DirCache=2 HSDir=2 HSIntro=4 HSRend=2 " \ "Cons=2 " \
"Link=5 LinkAuth=3 Microdesc=1-2 Relay=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. /** The required relay protocols for this authority's votes.
* WARNING: Requiring a new protocol causes old tor versions to shut down. * WARNING: Requiring a new protocol causes old tor versions to shut down.
* Requiring the wrong protocols can break the tor network. * Requiring the wrong protocols can break the tor network.
* See Proposal 303: When and how to remove support for protocol versions. * See Proposal 303: When and how to remove support for protocol versions.
*/ */
#define DIRVOTE_REQUIRE_RELAY_PROTO \ #define DIRVOTE_REQUIRE_RELAY_PROTO \
"Cons=1 Desc=1 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " \ "Cons=2 " \
"Link=3-4 Microdesc=1 Relay=1-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. /** The required relay protocols for this authority's votes.
* WARNING: Requiring a new protocol causes old tor versions to shut down. * WARNING: Requiring a new protocol causes old tor versions to shut down.
* Requiring the wrong protocols can break the tor network. * Requiring the wrong protocols can break the tor network.
* See Proposal 303: When and how to remove support for protocol versions. * See Proposal 303: When and how to remove support for protocol versions.
*/ */
#define DIRVOTE_REQUIRE_CLIENT_PROTO \ #define DIRVOTE_REQUIRE_CLIENT_PROTO \
"Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " \ "Cons=2 " \
"Link=4 Microdesc=1-2 Relay=2" "Desc=2 " \
"Link=4 " \
"Microdesc=2 " \
"Relay=2"
#endif /* defined(DIRVOTE_PRIVATE) */ #endif /* defined(DIRVOTE_PRIVATE) */