[tor-commits] [torspec/master] Add consensus method 28, which removes IPv6 addresses from microdescriptors

[nickm at torproject.org]

commit 52e70bd5064bd50ee1d84e810d3eeafd4092b246
Author: teor <teor2345 at gmail.com>
Date:   Tue Oct 17 22:42:52 2017 -0400

    Add consensus method 28, which removes IPv6 addresses from microdescriptors
    
    Documents #23828.
---
 dir-spec.txt | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/dir-spec.txt b/dir-spec.txt
index 7b636c4..5cf9770 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -1475,7 +1475,7 @@
         section 2.1.1.
 
         (Only included when generating microdescriptors for
-        consensus-method 14 or later.)
+        consensus-methods 14 to 27.)
 
      "family" names NL
 
@@ -2386,10 +2386,10 @@
        * the router advertises at least one IPv6 ORPort, and
        * AuthDirHasIPv6Connectivity 1 is set on the authority.
    A minority of voting authorities that set AuthDirHasIPv6Connectivity will
-   drop unreachable IPv6 ORPorts from the full consensus. But they can not
-   drop IPv6 ORPorts from microdescriptors. Consensus method 27 in 0.3.3.x
-   puts IPv6 ORPorts in the microdesc consensus, so that authorities can
-   drop unreachable IPv6 ORPorts from all consensus flavours.
+   drop unreachable IPv6 ORPorts from the full consensus. Consensus method 27
+   in 0.3.3.x puts IPv6 ORPorts in the microdesc consensus, so that
+   authorities can drop unreachable IPv6 ORPorts from all consensus flavours.
+   Consensus method 28 removes IPv6 ORPorts from microdescriptors.
 
    "Stable" -- A router is 'Stable' if it is active, and either its Weighted
    MTBF is at least the median for known active routers or its Weighted MTBF
@@ -2717,6 +2717,9 @@
         * If consensus method 27 or later is used, the microdesc consensus
           may include an "a" line for each router, listing an IPv6 OR port.
 
+        * If consensus method 28 or later is used, microdescriptors no longer
+          include "a" lines.
+
      The signatures at the end of a consensus document are sorted in
      ascending order by identity digest.
 
@@ -2799,6 +2802,7 @@
      "25" -- Vote on recommended-protocols and required-protocols.
      "26" -- Initialize bandwidth weights to 1 to avoid division-by-zero.
      "27" -- Adds support for "a" lines in microdescriptor consensues.
+     "28" -- Removes "a" lines from microdescriptors.
 
    Before generating a consensus, an authority must decide which consensus
    method to use.  To do this, it looks for the highest version number