aboutsummaryrefslogtreecommitdiff
path: root/src/or/or.h
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/or.h
parentf82f0c3eb1fcee6278769c2262779a0a295b184d (diff)
parentb7a1e793e69e540e0377fa4418810ff1c02d50f9 (diff)
downloadtor-b6164e1604be7f6692156d2103f2de0fba4ca8b5.tar.gz
tor-b6164e1604be7f6692156d2103f2de0fba4ca8b5.zip
Merge remote-tracking branch 'public/feature20552'
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h
index a43e2a33cd..eb94f63d5e 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2265,6 +2265,10 @@ typedef struct routerstatus_t {
* accept EXTEND2 cells */
unsigned int supports_extend2_cells:1;
+ /** True iff this router has a protocol list that allows it to negotiate
+ * ed25519 identity keys on a link handshake. */
+ unsigned int supports_ed25519_link_handshake:1;
+
unsigned int has_bandwidth:1; /**< The vote/consensus had bw info */
unsigned int has_exitsummary:1; /**< The vote/consensus had exit summaries */
unsigned int bw_is_unmeasured:1; /**< This is a consensus entry, with