[tor-commits] [tor/release-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.5

[dgoulet at torproject.org]

commit aac5731f86399a3ac37720f9d0c4cffacd8eb38a
Merge: 882fd1f0d4 72041c6306
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Jan 18 13:12:13 2022 -0500

    Merge branch 'maint-0.3.5' into maint-0.4.5

 changes/ticket40509      | 4 ++++
 src/core/or/protover.c   | 4 ++--
 src/test/test_protover.c | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --cc src/core/or/protover.c
index cb9a03d6ec,e047bfe200..d45246cb83
--- a/src/core/or/protover.c
+++ b/src/core/or/protover.c
@@@ -435,10 -422,9 +435,10 @@@ 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 "
+     "HSDir=2 "
 -    "HSIntro=4 "
++    "HSIntro=4-5 "
      "HSRend=1-2 "
      "Link=1-5 "
  #ifdef HAVE_WORKING_TOR_TLS_GET_TLSSECRETS
diff --cc src/test/test_protover.c
index 016cee7f15,3fbfe3a682..44febe0fa6
--- a/src/test/test_protover.c
+++ b/src/test/test_protover.c
@@@ -342,21 -361,23 +342,21 @@@ test_protover_supports_version(void *ar
   * Hard-coded here, because they are not in the code, or not exposed in the
   * headers. */
  #define PROTOVER_LINKAUTH_V1 1
 -#define PROTOVER_LINKAUTH_V3 3
 -
 +#define PROTOVER_LINKAUTH_V2 2
  #define PROTOVER_RELAY_V1 1
 -#define PROTOVER_RELAY_V2 2
  
 +/* Deprecated HSIntro versions */
 +#define PROTOVER_HS_INTRO_DEPRECATED_1 1
 +#define PROTOVER_HS_INTRO_DEPRECATED_2 2
  /* Highest supported HSv2 introduce protocol version.
 - * Hard-coded here, because it does not appear anywhere in the code.
   * It's not clear if we actually support version 2, see #25068. */
 -#define PROTOVER_HSINTRO_V2 4
 +#define PROTOVER_HS_INTRO_V2 3
  
 -/* HSv2 Rend and HSDir protocol versions.
 - * Hard-coded here, because they do not appear anywhere in the code. */
 +/* 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.
 - * Hard-coded here, because they do not appear anywhere in the code. */
 +/* DirCache, Desc, Microdesc, and Cons protocol versions. */
  #define PROTOVER_DIRCACHE_V1 1
  #define PROTOVER_DIRCACHE_V2 2