[tor-commits] [torspec/master] Update dir-spec with proposal 178

[nickm at torproject.org]

commit 71a28234703724b97508936e396f0a028e2523d8
Author: Sebastian Hahn <sebastian at torproject.org>
Date:   Sat Nov 26 04:11:24 2011 +0100

    Update dir-spec with proposal 178
---
 dir-spec.txt |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/dir-spec.txt b/dir-spec.txt
index 539581b..f1aef64 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -1566,9 +1566,15 @@
 
      Known-flags is the union of all flags known by any voter.
 
-     Entries are given on the "params" line for every keyword on which any
-     authority voted.  The values given are the low-median of all votes on
-     that keyword.
+     Entries are given on the "params" line for every keyword on which a
+     majority of authorities (total authorities, not just those
+     participating in this vote) voted on, or if at least three
+     authorities voted for that parameter. The values given are the
+     low-median of all votes on that keyword.
+
+     Consensus methods 11 and before, entries are given on the "params"
+     line for every keyword on which any authority voted, the value given
+     being the low-median of all votes on that keyword.
 
     "client-versions" and "server-versions" are sorted in ascending
      order; A version is recommended in the consensus if it is recommended
@@ -1645,6 +1651,10 @@
           method 11 or later is in use, any router that is determined to get
           the BadExit flag doesn't count when we're calculating weights.
 
+        * If consensus method 12 or later is used, only consensus
+          parameters that more than half of the total number of
+          authorities voted for are included in the consensus.
+
      The signatures at the end of a consensus document are sorted in
      ascending order by identity digest.
 
@@ -1671,6 +1681,7 @@
      "9" -- Provides weights for selecting flagged routers in paths
      "10" -- Fixes edge case bugs in router flag selection weights
      "11" -- Don't consider BadExits when calculating bandwidth weights
+     "12" -- Params are only included if enough auths voted for them
 
 
    Before generating a consensus, an authority must decide which consensus