tor

commit 56857291b08b65be6bc6d89e4b98e84862b559a2
parent 1c39d969b99b7825a0e2f2db67efb0c0e19d7002
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 31 Jan 2018 14:33:12 -0500

Merge branch 'bug25105_032' into maint-0.3.2

Diffstat:
A
changes/bug25105
 | 
5
+++++
M
src/or/routerparse.c
 | 
2
+-

2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/changes/bug25105 b/changes/bug25105
@@ -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.
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
@@ -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))) {