tor

commit 9b6b1aedcdd1f8b76379fb9796020a04416e6b16
parent 9fbedc74c3f3b26efdec7300e1cc41e7e2c23f49
Author: George Kadianakis <desnacked@riseup.net>
Date:   Fri, 12 Feb 2021 13:54:18 +0200

Merge branch 'maint-0.4.5'

Diffstat:
A
changes/ticket40221_045
 | 
6
++++++
M
src/core/or/protover.c
 | 
2
+-
M
src/rust/protover/protover.rs
 | 
4
++--
M
src/test/test_protover.c
 | 
3
---

4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/changes/ticket40221_045 b/changes/ticket40221_045
@@ -0,0 +1,6 @@
+  o Minor features (protocol versions):
+    - Stop claiming to support the "DirCache=1" subprotocol version.
+      Technically, we stopped supporting this subprotocol back in
+      0.4.5.1-alpha, but we needed to wait for the authorities to stop
+      listing it as "required" before we can drop support. Closes ticket
+      40221.
diff --git a/src/core/or/protover.c b/src/core/or/protover.c
@@ -398,7 +398,7 @@ protover_get_supported_protocols(void)
   return
     "Cons=1-2 "
     "Desc=1-2 "
-    "DirCache=1-2 "
+    "DirCache=2 "
     "FlowCtrl=1 "
     "HSDir=1-2 "
     "HSIntro=3-5 "
diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs
@@ -160,7 +160,7 @@ pub(crate) fn get_supported_protocols_cstr() -> &'static CStr {
         cstr!(
             "Cons=1-2 \
              Desc=1-2 \
-             DirCache=1-2 \
+             DirCache=2 \
              FlowCtrl=1 \
              HSDir=1-2 \
              HSIntro=3-5 \
@@ -175,7 +175,7 @@ pub(crate) fn get_supported_protocols_cstr() -> &'static CStr {
         cstr!(
             "Cons=1-2 \
              Desc=1-2 \
-             DirCache=1-2 \
+             DirCache=2 \
              FlowCtrl=1 \
              HSDir=1-2 \
              HSIntro=3-5 \
diff --git a/src/test/test_protover.c b/src/test/test_protover.c
@@ -469,9 +469,6 @@ test_protover_supported_protocols(void *arg)
   /* No DirCache versions appear anywhere in the code. */
   tt_assert(protocol_list_supports_protocol(supported_protocols,
                                             PRT_DIRCACHE,
-                                            PROTOVER_DIRCACHE_V1));
-  tt_assert(protocol_list_supports_protocol(supported_protocols,
-                                            PRT_DIRCACHE,
                                             PROTOVER_DIRCACHE_V2));
 
   /* No Desc versions appear anywhere in the code. */