aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Palfrader <peter@palfrader.org>2008-06-13 21:30:20 +0000
committerPeter Palfrader <peter@palfrader.org>2008-06-13 21:30:20 +0000
commita6d1697769eafae28d72deac759bbfb74a7a7821 (patch)
tree26e75b76f53b2e38bc6864da3dfb7c06ca70fb0a
parent8f6cca35e204816d44be0e7b89dd1907faccab66 (diff)
downloadtorspec-a6d1697769eafae28d72deac759bbfb74a7a7821.tar.gz
torspec-a6d1697769eafae28d72deac759bbfb74a7a7821.zip
Merge proposal 138 as Closed and merge it into the main spec
svn:r15232
-rw-r--r--dir-spec.txt4
-rw-r--r--proposals/000-index.txt4
-rw-r--r--proposals/138-remove-down-routers-from-consensus.txt2
3 files changed, 7 insertions, 3 deletions
diff --git a/dir-spec.txt b/dir-spec.txt
index 71b588c..e7f007d 100644
--- a/dir-spec.txt
+++ b/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/proposals/000-index.txt b/proposals/000-index.txt
index ea7e956..3c13bb1 100644
--- a/proposals/000-index.txt
+++ b/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/proposals/138-remove-down-routers-from-consensus.txt b/proposals/138-remove-down-routers-from-consensus.txt
index 5abd287..c20f705 100644
--- a/proposals/138-remove-down-routers-from-consensus.txt
+++ b/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.