diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-11-09 09:17:53 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-11-09 09:17:53 -0500 |
| commit | 06260315645945ca9e08b5a19b67c8adad65a698 (patch) | |
| tree | 52d4a7cd26645cceb9f4204eb72bca29eea27766 /src/or/routerparse.c | |
| parent | 59c1016aba63c62e658065475add3cf77f665afa (diff) | |
| parent | 3124c921e7af15548b8b16d5f239bfdcd178b2ca (diff) | |
| download | tor-06260315645945ca9e08b5a19b67c8adad65a698.tar.gz tor-06260315645945ca9e08b5a19b67c8adad65a698.zip | |
Merge branch 'ticket20895'
Diffstat (limited to 'src/or/routerparse.c')
| -rw-r--r-- | src/or/routerparse.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 65874ae068..f1895ce313 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -2701,8 +2701,10 @@ 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 = + rs->supports_ed25519_link_handshake_compat = protocol_list_supports_protocol(tok->args[0], PRT_LINKAUTH, 3); + rs->supports_ed25519_link_handshake_any = + protocol_list_supports_protocol_or_later(tok->args[0], PRT_LINKAUTH, 3); rs->supports_ed25519_hs_intro = protocol_list_supports_protocol(tok->args[0], PRT_HSINTRO, 4); rs->supports_v3_hsdir = |