Merge branch 'maint-0.4.5'

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.

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 "

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 \

src/test/test_protover.c

@@ -467,9 +467,6 @@ test_protover_supported_protocols(void *arg)
                                             PROTOVER_HSDIR_V3));
 
   /* 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));