Merge branch 'maint-0.3.5' into maint-0.4.5

changes/ticket40509

@@ -0,0 +1,4 @@
+  o Minor bugfix (relay):
+    - Remove the HSDir and HSIntro onion service v2 protocol versions so relay
+      stop advertising that they support them. Fixes bug 40509; bugfix on
+      0.3.5.17.

src/core/or/protover.c

@@ -437,8 +437,8 @@ protover_get_supported_protocols(void)
     "Desc=1-2 "
     "DirCache=2 "
     "FlowCtrl=1 "
-    "HSDir=1-2 "
-    "HSIntro=3-5 "
+    "HSDir=2 "
+    "HSIntro=4-5 "
     "HSRend=1-2 "
     "Link=1-5 "
 #ifdef HAVE_WORKING_TOR_TLS_GET_TLSSECRETS

src/test/test_protover.c

@@ -354,7 +354,7 @@ test_protover_supports_version(void *arg)
 
 /* HSv2 Rend and HSDir protocol versions. */
 #define PROTOVER_HS_RENDEZVOUS_POINT_V2 1
-#define PROTOVER_HSDIR_V2 1
+#define PROTOVER_HSDIR_V2 2
 
 /* DirCache, Desc, Microdesc, and Cons protocol versions. */
 #define PROTOVER_DIRCACHE_V1 1