summaryrefslogtreecommitdiff
path: root/src/or/routerparse.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-11-10 09:25:11 -0500
committerNick Mathewson <nickm@torproject.org>2016-11-10 09:25:11 -0500
commitb6164e1604be7f6692156d2103f2de0fba4ca8b5 (patch)
tree7a0385fbc7f2036e78899195fb89323487bc0386 /src/or/routerparse.c
parentf82f0c3eb1fcee6278769c2262779a0a295b184d (diff)
parentb7a1e793e69e540e0377fa4418810ff1c02d50f9 (diff)
downloadtor-b6164e1604be7f6692156d2103f2de0fba4ca8b5.tar.gz
tor-b6164e1604be7f6692156d2103f2de0fba4ca8b5.zip
Merge remote-tracking branch 'public/feature20552'
Diffstat (limited to 'src/or/routerparse.c')
-rw-r--r--src/or/routerparse.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index b391e88f22..2cfd3fc58a 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -2682,6 +2682,8 @@ routerstatus_parse_entry_from_string(memarea_t *area,
rs->protocols_known = 1;
rs->supports_extend2_cells =
protocol_list_supports_protocol(tok->args[0], PRT_RELAY, 2);
+ rs->supports_ed25519_link_handshake =
+ protocol_list_supports_protocol(tok->args[0], PRT_LINKAUTH, 3);
}
if ((tok = find_opt_by_keyword(tokens, K_V))) {
tor_assert(tok->n_args == 1);