Merge branch 'tor-gitlab/mr/176' into maint-0.4.4 (26cfac18) · Commits · Benjamin J. Thompson / Tor

changes/ticket40162

0 → 100644

+7 −0

Original line number	Diff line number	Diff line
		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.

src/feature/dirauth/dirvote.h

+40 −12

Original line number	Diff line number	Diff line
		@@ -239,14 +239,30 @@ STATIC microdesc_t dirvote_create_microdescriptor(const routerinfo_t ri,
		* 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"
		"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"
		"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.
		@@ -254,16 +270,28 @@ STATIC microdesc_t dirvote_create_microdescriptor(const routerinfo_t ri,
		* 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"
		"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"
		"Cons=2 " \
		"Desc=2 " \
		"Link=4 " \
		"Microdesc=2 " \
		"Relay=2"

		#endif /* defined(DIRVOTE_PRIVATE) */