[tor-commits] [torspec/master] Correct the multiplicity of the "a" lines.

[nickm at torproject.org]

commit f9eeae509344dcfd1f185d0130a0055b00131cea
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 25 12:31:15 2017 -0400

    Correct the multiplicity of the "a" lines.
    
    These are all "any number" items -- saying "at most once" implies
    that we should reject consensus or md documents that include them
    more then once, which isn't true.
---
 dir-spec.txt | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/dir-spec.txt b/dir-spec.txt
index a0133d5..7adcd76 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -1463,12 +1463,13 @@
 
      "a" SP address ":" port NL
 
-        [At most once]
+        [Any number]
 
-        The first advertised IPv6 address for the OR.
+        Additional advertised addresses for the OR.
 
-        Present only if the OR advertises at least one IPv6 address.
-        Any other IPv4 or IPv6 addresses are ignored.
+        Present currently only if the OR advertises at least one IPv6
+        address; currently, the first address is included and all others are
+        omitted. Any other IPv4 or IPv6 addresses should be ignored.
 
         Address and port are as for "or-address" as specified in
         section 2.1.1.
@@ -2135,13 +2136,13 @@
 
     "a" SP address ":" port NL
 
-        [At most once]
+        [Any number]
 
         The first advertised IPv6 address for the OR, if it is reachable.
 
         Present only if the OR advertises at least one IPv6 address, and the
         authority believes that the first advertised address is reachable.
-        Any other IPv4 or IPv6 addresses are ignored.
+        Any other IPv4 or IPv6 addresses should be ignored.
 
         Address and port are as for "or-address" as specified in
         section 2.1.1.
@@ -3077,11 +3078,13 @@
 
     "a" SP address ":" port NL
 
-        [Zero times.]
+        [Any number]
 
         IPv6 ORPorts are contained in microdescriptors and therefore omitted
         in the microdescriptor consensus.
 
+        Not currently generated.
+
     "p" ... NL
 
         [Zero times.]