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/connection_or.c | |
| parent | 59c1016aba63c62e658065475add3cf77f665afa (diff) | |
| parent | 3124c921e7af15548b8b16d5f239bfdcd178b2ca (diff) | |
| download | tor-06260315645945ca9e08b5a19b67c8adad65a698.tar.gz tor-06260315645945ca9e08b5a19b67c8adad65a698.zip | |
Merge branch 'ticket20895'
Diffstat (limited to 'src/or/connection_or.c')
| -rw-r--r-- | src/or/connection_or.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 9e34063609..7af1f2b645 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -886,7 +886,7 @@ connection_or_check_canonicity(or_connection_t *conn, int started_here) const node_t *r = node_get_by_id(id_digest); if (r && - node_supports_ed25519_link_authentication(r) && + node_supports_ed25519_link_authentication(r, 1) && ! node_ed25519_id_matches(r, ed_id)) { /* If this node is capable of proving an ed25519 ID, * we can't call this a canonical connection unless both IDs match. */ |