nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.5' into maint-0.4.5

Browse Source
This commit is contained in:
David Goulet 2022-01-18 13:12:13 -05:00
commit aac5731f86
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/ticket40509 Normal file
View File

@ -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.

4
src/core/or/protover.c
View File

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

2
src/test/test_protover.c
View File

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