sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.3.2' into release-0.3.2

This commit is contained in:
Nick Mathewson 2018-01-31 14:33:46 -05:00
parent 2485f8dea4 56857291b0
commit a877241e6c
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug25105 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (v3 onion services):
- Look at the "HSRend" protocol version, not the "HSDir" protocol
version, when deciding whether a consensus entry can support
the v3 onion service protocol as a rendezvous point.
Fixes bug 25105; bugfix on 0.3.2.1-alpha.

2
src/or/routerparse.c
View File

@ -2709,7 +2709,7 @@ routerstatus_parse_entry_from_string(memarea_t *area,
protocol_list_supports_protocol(tok->args[0], PRT_HSDIR,
PROTOVER_HSDIR_V3);
rs->supports_v3_rendezvous_point =
protocol_list_supports_protocol(tok->args[0], PRT_HSDIR,
protocol_list_supports_protocol(tok->args[0], PRT_HSREND,
PROTOVER_HS_RENDEZVOUS_POINT_V3);
}
if ((tok = find_opt_by_keyword(tokens, K_V))) {