commit 313eff650d3aa7d4a221ea2f21074eb7cc7d5c52 Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 15 10:52:23 2016 -0400

Clarify NoEdConsensus flag a bit harder.

(Note that no corresponding tor change is needed, since we don't actually use these keys yet.)

Resolves 17668.{S1,T1} --- dir-spec.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/dir-spec.txt b/dir-spec.txt index d3e5228..57188eb 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -1401,6 +1401,10 @@ The node's master Ed25519 identity key, base64 encoded, without trailing =s.

+ All implementations MUST ignore this key for any microdescriptor + whose corresponding entry in the consensus includes the + 'NoEdConsensus' flag. + (Only included when generating microdescriptors for consensus-method 21 or later.)

@@ -2388,8 +2392,10 @@ "id" lines in microdescriptors.

* If consensus method 22 or later is used, and the votes do not - produce a majority consensus about Ed25519 key (see 3.8.0.1 below), the - consensus must include a NoEdConsensus flag on the "s" line. + produce a majority consensus about a relay's Ed25519 key (see + 3.8.0.1 below), the consensus must include a NoEdConsensus flag on + the "s" line for every relay whose listed Ed key does not reflect + consensus.

The signatures at the end of a consensus document are sorted in ascending order by identity digest.