[tor-commits] [torspec/master] Merge remote-tracking branch 'tor-gitlab/mr/14' into master

[asn at torproject.org]

commit 4dd38cadbbb58db7d475452115bdc7c172264eda
Merge: ed64359 1040c2d
Author: George Kadianakis <desnacked at riseup.net>
Date:   Fri Oct 30 14:12:34 2020 +0200

    Merge remote-tracking branch 'tor-gitlab/mr/14' into master

 dir-spec.txt | 46 ++++++++++++++++++++++++++++++++--------------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --cc dir-spec.txt
index 6f8efff,68a1319..a29d86a
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@@ -843,10 -855,12 +855,12 @@@
         sorted by keyword.  Values should be numerically ascending within each
         entry.  (This implies that there should be no overlapping ranges.)
         Ranges should be represented as compactly as possible. Ints must be no
 -       more than 2^32 - 2. (Yes, 2.)
 +       larger than 63.
  
-        This field was first added in Tor 0.2.9.x. Some time after all earlier
-        Tor relay versions are obsolete, it will become mandatory.
+        This field was first added in Tor 0.2.9.x.
+ 
+        [Before Tor 0.4.5.1-alpha, this field was optional.]
+ 
  
  2.1.2. Extra-info document format