[tor-commits] [tor/release-0.3.2] Look at the correct protocol for supports_v3_rendezvous_point

[nickm at torproject.org]

commit 31f2a8771cf0075f4a0ef5625d3947a683305ff9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 31 14:01:49 2018 -0500

    Look at the correct protocol for supports_v3_rendezvous_point
    
    Fixes bug 25105; bugfix on 0.3.2.1-alpha.
    
    (This is a backport of bbf2d9cf6bb97c3e15ada58 for 0.3.2.)
---
 changes/bug25105     | 5 +++++
 src/or/routerparse.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changes/bug25105 b/changes/bug25105
new file mode 100644
index 000000000..36d1a5f16
--- /dev/null
+++ 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
index 15cdb0bbd..3eda024f0 100644
--- 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))) {