[tor-commits] [torspec/master] Fix ordering of flag-threshold parameter

[atagar at torproject.org]

commit 3c91ffac5f5c04b1f3295d961d95a8f00cf5c2fe
Author: Damian Johnson <atagar at torproject.org>
Date:   Mon Jan 2 12:15:26 2017 -0800

    Fix ordering of flag-threshold parameter
    
    Spec doesn't match tor with regard to the ordering of this field either. It was
    added way back in 2013 but for Stem's checks I coded against tor's actual
    behavior rather than the spec. Hence why it went under the radar.
---
 dir-spec.txt | 88 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

diff --git a/dir-spec.txt b/dir-spec.txt
index c701842..26b0800 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -1575,50 +1575,6 @@
         consensus document produced from this vote should not be used.
         See section 1.4 for voting timeline information.
 
-    "flag-thresholds" SP Thresholds NL
-
-         [At most once for votes; does not occur in consensuses.]
-
-         A space-separated list of the internal performance thresholds
-         that the directory authority had at the moment it was forming
-         a vote.
-
-         The metaformat is:
-            Thresholds = Threshold | Threshold SP Thresholds
-            Threshold = ThresholdKey '=' ThresholdVal
-            ThresholdKey = (KeywordChar | "_") +
-            ThresholdVal = [0-9]+("."[0-9]+)? "%"?
-
-         Commonly used Thresholds at this point include:
-
-         "stable-uptime" -- Uptime (in seconds) required for a relay
-                            to be marked as stable.
-
-         "stable-mtbf" -- MTBF (in seconds) required for a relay to be
-                          marked as stable.
-
-         "enough-mtbf" -- Whether we have measured enough MTBF to look
-                          at stable-mtbf instead of stable-uptime.
-
-         "fast-speed" -- Bandwidth (in bytes per second) required for
-                         a relay to be marked as fast.
-
-         "guard-wfu" -- WFU (in seconds) required for a relay to be
-                        marked as guard.
-
-         "guard-tk" -- Weighted Time Known (in seconds) required for a
-                       relay to be marked as guard.
-
-         "guard-bw-inc-exits" -- If exits can be guards, then all guards
-                                 must have a bandwidth this high.
-
-         "guard-bw-exc-exits" -- If exits can't be guards, then all guards
-                                 must have a bandwidth this high.
-
-         "ignoring-advertised-bws" -- 1 if we have enough measured bandwidths
-                                 that we'll ignore the advertised bandwidth
-                                 claims of routers without measured bandwidth.
-
     "fresh-until" SP YYYY-MM-DD SP HH:MM:SS NL
 
         [Exactly once.]
@@ -1696,6 +1652,50 @@
         enough votes were counted for the consensus for an authoritative
         opinion to have been formed about their status.
 
+    "flag-thresholds" SP Thresholds NL
+
+         [At most once for votes; does not occur in consensuses.]
+
+         A space-separated list of the internal performance thresholds
+         that the directory authority had at the moment it was forming
+         a vote.
+
+         The metaformat is:
+            Thresholds = Threshold | Threshold SP Thresholds
+            Threshold = ThresholdKey '=' ThresholdVal
+            ThresholdKey = (KeywordChar | "_") +
+            ThresholdVal = [0-9]+("."[0-9]+)? "%"?
+
+         Commonly used Thresholds at this point include:
+
+         "stable-uptime" -- Uptime (in seconds) required for a relay
+                            to be marked as stable.
+
+         "stable-mtbf" -- MTBF (in seconds) required for a relay to be
+                          marked as stable.
+
+         "enough-mtbf" -- Whether we have measured enough MTBF to look
+                          at stable-mtbf instead of stable-uptime.
+
+         "fast-speed" -- Bandwidth (in bytes per second) required for
+                         a relay to be marked as fast.
+
+         "guard-wfu" -- WFU (in seconds) required for a relay to be
+                        marked as guard.
+
+         "guard-tk" -- Weighted Time Known (in seconds) required for a
+                       relay to be marked as guard.
+
+         "guard-bw-inc-exits" -- If exits can be guards, then all guards
+                                 must have a bandwidth this high.
+
+         "guard-bw-exc-exits" -- If exits can't be guards, then all guards
+                                 must have a bandwidth this high.
+
+         "ignoring-advertised-bws" -- 1 if we have enough measured bandwidths
+                                 that we'll ignore the advertised bandwidth
+                                 claims of routers without measured bandwidth.
+
     "shared-rand-participate" NL
 
         [At most once for votes; does not occur in consensuses.]