[tor-commits] [torspec/master] Describe 'id' line in microdescs, and consensus method 18

[nickm at torproject.org]

commit 22cda727f5f8457fbaece944d6ef34bb971d0541
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 5 11:35:27 2014 -0400

    Describe 'id' line in microdescs, and consensus method 18
---
 dir-spec.txt |   13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/dir-spec.txt b/dir-spec.txt
index 1fb2392..2619b2b 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -1197,6 +1197,16 @@
         (Only included when generating microdescriptors for
         consensus-method 15 or later.)
 
+     "id" SP base64-encoded-identity-digest NL
+
+        [At most once]
+
+        The node identity digest (as described in tor-spec.txt), base64
+        encoded, without trailing =s.  This line is included to prevent
+        collisions between microdescriptors.
+
+        (Only included when generating microdescriptors for
+        consensus-method 18 or later.)
 
    (Note that with microdescriptors, clients do not learn the identity of
    their routers: they only learn a hash of the identity key.  This is all
@@ -2072,6 +2082,9 @@
           bandwidth values in votes. They also add an "Unmeasured=1"
           flag to such 'w' lines.
 
+        * If consensus method 18 or later is used, authorities include
+          "id" lines in microdescriptors.
+
      The signatures at the end of a consensus document are sorted in
      ascending order by identity digest.