[or-cvs] r15232: Merge proposal 138 as Closed and merge it into the main spec (in tor/trunk/doc/spec: . proposals)

[weasel@xxxxxxxx]

Author: weasel
Date: 2008-06-13 17:30:20 -0400 (Fri, 13 Jun 2008)
New Revision: 15232

Modified:
   tor/trunk/doc/spec/dir-spec.txt
   tor/trunk/doc/spec/proposals/000-index.txt
   tor/trunk/doc/spec/proposals/138-remove-down-routers-from-consensus.txt
Log:
Merge proposal 138 as Closed and merge it into the main spec


Modified: tor/trunk/doc/spec/dir-spec.txt
===================================================================
--- tor/trunk/doc/spec/dir-spec.txt	2008-06-13 21:30:17 UTC (rev 15231)
+++ tor/trunk/doc/spec/dir-spec.txt	2008-06-13 21:30:20 UTC (rev 15232)
@@ -1164,6 +1164,9 @@
         * The version is given as whichever version is listed by the most
           voters, with ties decided in favor of more recent versions.
 
+        * If consensus-method 4 or later is in use, then routers that
+          do not have the Running flag are not listed at all.
+
      The signatures at the end of a consensus document are sorted in
      ascending order by identity digest.
 
@@ -1182,6 +1185,7 @@
      "1" -- The first implemented version.
      "2" -- Added support for the Unnamed flag.
      "3" -- Added legacy ID key support to aid in authority ID key rollovers
+     "4" -- No longer list routers that are not running in the consensus
 
    Before generating a consensus, an authority must decide which consensus
    method to use.  To do this, it looks for the highest version number

Modified: tor/trunk/doc/spec/proposals/000-index.txt
===================================================================
--- tor/trunk/doc/spec/proposals/000-index.txt	2008-06-13 21:30:17 UTC (rev 15231)
+++ tor/trunk/doc/spec/proposals/000-index.txt	2008-06-13 21:30:20 UTC (rev 15232)
@@ -60,7 +60,7 @@
 135  Simplify Configuration of Private Tor Networks [OPEN]
 136  Mass authority migration with legacy keys [OPEN]
 137  Keep controllers informed as Tor bootstraps [OPEN]
-138  Remove routers that are not Running from consensus documents [OPEN]
+138  Remove routers that are not Running from consensus documents [CLOSED]
 
 
 Proposals by status:
@@ -78,7 +78,6 @@
    135  Simplify Configuration of Private Tor Networks
    136  Mass authority migration with legacy keys
    137  Keep controllers informed as Tor bootstraps
-   138  Remove routers that are not Running from consensus documents
  NEEDS-REVISION:
    110  Avoiding infinite length circuits
    117  IPv6 exits
@@ -110,6 +109,7 @@
    126  Getting GeoIP data and publishing usage summaries
    129  Block Insecure Protocols by Default
    130  Version 2 Tor connection protocol
+   138  Remove routers that are not Running from consensus documents
  SUPERSEDED:
    112  Bring Back Pathlen Coin Weight
    113  Simplifying directory authority administration

Modified: tor/trunk/doc/spec/proposals/138-remove-down-routers-from-consensus.txt
===================================================================
--- tor/trunk/doc/spec/proposals/138-remove-down-routers-from-consensus.txt	2008-06-13 21:30:17 UTC (rev 15231)
+++ tor/trunk/doc/spec/proposals/138-remove-down-routers-from-consensus.txt	2008-06-13 21:30:20 UTC (rev 15232)
@@ -4,7 +4,7 @@
 Last-Modified: $Date$
 Author: Peter Palfrader
 Created: 11-Jun-2008
-Status: Open
+Status: Closed
 
 1. Overview.