diff options
| author | David Goulet <dgoulet@torproject.org> | 2022-01-18 13:12:35 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2022-01-18 13:12:35 -0500 |
| commit | 7d9d769123c33a88b6f441e19faf56c2c1e5931c (patch) | |
| tree | 666d715acee0a2d2b19ea87ddbc0f260ff32c9c6 | |
| parent | 413e0c7575c27c6a8e66ed19d088be636a70ffbd (diff) | |
| parent | aac5731f86399a3ac37720f9d0c4cffacd8eb38a (diff) | |
| download | tor-7d9d769123c33a88b6f441e19faf56c2c1e5931c.tar.gz tor-7d9d769123c33a88b6f441e19faf56c2c1e5931c.zip | |
Merge branch 'maint-0.4.5' into maint-0.4.6
| -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 04df8aeeb8..484c15386f 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 4b25a86e26..6ebc84b5a4 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 |