tor

commit 14c56d03f87e52698b0d5abcdc9416ab3e70a146
parent 85ce6234554dff849d61c2f46ee8ea2cbd4d6700
Author: David Goulet <dgoulet@torproject.org>
Date:   Wed, 26 Mar 2025 14:09:15 -0400

Merge branch 'maint-0.4.8'

Diffstat:
A
changes/ticket40836
 | 
18
++++++++++++++++++
M
src/core/or/protover.c
 | 
14
+++++++-------

2 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/changes/ticket40836 b/changes/ticket40836
@@ -0,0 +1,18 @@
+  o Minor features (required protocols):
+    - Directory authorities now vote to require relays to support certain
+      protocols, all of which have been implemented since 0.4.7.4-alpha or
+      earlier.
+      These include improved support for connecting to relays on IPv6,
+      NtorV3, running as a rate-limited introduction point,
+      authenticated SENDMEs, and congestion control.
+      Part of ticket 40836.
+    - Directory authorities now vote to require clients to support the
+      authenticated SENDME feature, which was introduced in 0.4.1.1-alpha.
+      Part of ticket 40836.
+
+  o Minor features (recommended protocols):
+    - Directory authorities now vote to recommend that clients
+      support certain protocols beyond those that are required.
+      These include improved support for connecting to relays on IPv6,
+      NtorV3, and congestion control.
+      Part of ticket 40836.
diff --git a/src/core/or/protover.c b/src/core/or/protover.c
@@ -517,8 +517,8 @@ protover_get_supported_protocols(void)
 const char *
 protover_get_recommended_client_protocols(void)
 {
-  return "Cons=2 Desc=2 DirCache=2 HSDir=2 HSIntro=4 HSRend=2 "
-         "Link=4-5 Microdesc=2 Relay=2";
+  return "Cons=2 Desc=2 DirCache=2 FlowCtrl=1-2 HSDir=2 HSIntro=4 HSRend=2 "
+         "Link=4-5 Microdesc=2 Relay=2-4";
 }
 
 /** Return the recommended relay protocols list that directory authorities
@@ -526,8 +526,8 @@ protover_get_recommended_client_protocols(void)
 const char *
 protover_get_recommended_relay_protocols(void)
 {
-  return "Cons=2 Desc=2 DirCache=2 HSDir=2 HSIntro=4 HSRend=2 "
-         "Link=4-5 LinkAuth=3 Microdesc=2 Relay=2";
+  return "Cons=2 Desc=2 DirCache=2 FlowCtrl=1-2 HSDir=2 HSIntro=4-5 HSRend=2 "
+         "Link=4-5 LinkAuth=3 Microdesc=2 Relay=2-4";
 }
 
 /** Return the required client protocols list that directory authorities
@@ -535,7 +535,7 @@ protover_get_recommended_relay_protocols(void)
 const char *
 protover_get_required_client_protocols(void)
 {
-  return "Cons=2 Desc=2 Link=4 Microdesc=2 Relay=2";
+  return "Cons=2 Desc=2 FlowCtrl=1 Link=4 Microdesc=2 Relay=2";
 }
 
 /** Return the required relay protocols list that directory authorities
@@ -543,8 +543,8 @@ protover_get_required_client_protocols(void)
 const char *
 protover_get_required_relay_protocols(void)
 {
-  return "Cons=2 Desc=2 DirCache=2 HSDir=2 HSIntro=4 HSRend=2 "
-         "Link=4-5 LinkAuth=3 Microdesc=2 Relay=2";
+  return "Cons=2 Desc=2 DirCache=2 FlowCtrl=1-2 HSDir=2 HSIntro=4-5 HSRend=2 "
+         "Link=4-5 LinkAuth=3 Microdesc=2 Relay=2-4";
 }
 
 /*