diff options
| author | David Goulet <dgoulet@torproject.org> | 2022-01-18 13:12:13 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2022-01-18 13:12:13 -0500 |
| commit | aac5731f86399a3ac37720f9d0c4cffacd8eb38a (patch) | |
| tree | b194d62a8784efc16541c02de4fc72cd1f629888 | |
| parent | 882fd1f0d45656e0535e70b5e115281b39ac6307 (diff) | |
| parent | 72041c63064b461e2eb9102f12c4fe217e9066dd (diff) | |
| download | tor-aac5731f86399a3ac37720f9d0c4cffacd8eb38a.tar.gz tor-aac5731f86399a3ac37720f9d0c4cffacd8eb38a.zip | |
Merge branch 'maint-0.3.5' into maint-0.4.5
| -rw-r--r-- | changes/ticket40509 | 4 | ||||
| -rw-r--r-- | src/core/or/protover.c | 4 | ||||
| -rw-r--r-- | src/test/test_protover.c | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/changes/ticket40509 b/changes/ticket40509 new file mode 100644 index 0000000000..ba4502ff3b --- /dev/null +++ b/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. diff --git a/src/core/or/protover.c b/src/core/or/protover.c index cb9a03d6ec..d45246cb83 100644 --- a/src/core/or/protover.c +++ b/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 diff --git a/src/test/test_protover.c b/src/test/test_protover.c index 016cee7f15..44febe0fa6 100644 --- a/src/test/test_protover.c +++ b/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 |