Merge proposal 138 as Closed and merge it into the main spec

svn:r15232

diff --git a/doc/spec/dir-spec.txt b/doc/spec/dir-spec.txt
index 71b588cffaa2db2e9d618d92ed489c25ffea7a67..e7f007d6fc9f17fafe151e7855dcbfac6428ad81 100644 (file)
--- a/doc/spec/dir-spec.txt
+++ b/doc/spec/dir-spec.txt
@@ -1164,6 +1164,9 @@ $Id$
         * 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 @@ $Id$
      "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

diff --git a/doc/spec/proposals/000-index.txt b/doc/spec/proposals/000-index.txt
index ea7e956c046aa1cab18bedc85f68cb174f91e7e9..3c13bb1ec91ef596c233f99670fdcdddc81cc3c0 100644 (file)
--- a/doc/spec/proposals/000-index.txt
+++ b/doc/spec/proposals/000-index.txt
@@ -60,7 +60,7 @@ Proposals by number:
 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 @@ Proposals by status:
    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 @@ Proposals by status:
    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

diff --git a/doc/spec/proposals/138-remove-down-routers-from-consensus.txt b/doc/spec/proposals/138-remove-down-routers-from-consensus.txt
index 5abd287df0bdf4e89c0aa701bdefc8d7291547f7..c20f705a12b999cbb2aab74b80110c1483409c78 100644 (file)
--- a/doc/spec/proposals/138-remove-down-routers-from-consensus.txt
+++ b/doc/spec/proposals/138-remove-down-routers-from-consensus.txt
@@ -4,7 +4,7 @@ Version: $Revision$
 Last-Modified: $Date$
 Author: Peter Palfrader
 Created: 11-Jun-2008
-Status: Open
+Status: Closed
 
 1. Overview.