aboutsummaryrefslogtreecommitdiff
path: root/proposals
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-12-09 13:57:23 +0000
committerNick Mathewson <nickm@torproject.org>2008-12-09 13:57:23 +0000
commit1ecd21cfd4af87129dbfffabbfe6bad9b292a2df (patch)
treed2ff5c05e0105c62732851cb50b6cfd0af21e409 /proposals
parent57a7e9094f8dd82bccc79a7068c6876618579b69 (diff)
downloadtorspec-1ecd21cfd4af87129dbfffabbfe6bad9b292a2df.tar.gz
torspec-1ecd21cfd4af87129dbfffabbfe6bad9b292a2df.zip
Merge proposal 136 into dir-spec.txt. We need to get better about doing this.
svn:r17528
Diffstat (limited to 'proposals')
-rw-r--r--proposals/000-index.txt4
-rw-r--r--proposals/136-legacy-keys.txt2
2 files changed, 3 insertions, 3 deletions
diff --git a/proposals/000-index.txt b/proposals/000-index.txt
index 331a5ae..b0edd73 100644
--- a/proposals/000-index.txt
+++ b/proposals/000-index.txt
@@ -58,7 +58,7 @@ Proposals by number:
133 Incorporate Unreachable ORs into the Tor Network [DRAFT]
134 More robust consensus voting with diverse authority sets [ACCEPTED]
135 Simplify Configuration of Private Tor Networks [FINISHED]
-136 Mass authority migration with legacy keys [FINISHED]
+136 Mass authority migration with legacy keys [CLOSED]
137 Keep controllers informed as Tor bootstraps [CLOSED]
138 Remove routers that are not Running from consensus documents [CLOSED]
139 Download consensus documents only when it will be trusted [CLOSED]
@@ -121,7 +121,6 @@ Proposals by status:
111 Prioritizing local traffic over relayed traffic
128 Families of private bridges
135 Simplify Configuration of Private Tor Networks
- 136 Mass authority migration with legacy keys
CLOSED:
101 Voting on the Tor Directory System
102 Dropping "opt" from the directory format
@@ -140,6 +139,7 @@ Proposals by status:
126 Getting GeoIP data and publishing usage summaries
129 Block Insecure Protocols by Default
130 Version 2 Tor connection protocol
+ 136 Mass authority migration with legacy keys
137 Keep controllers informed as Tor bootstraps
138 Remove routers that are not Running from consensus documents
139 Download consensus documents only when it will be trusted
diff --git a/proposals/136-legacy-keys.txt b/proposals/136-legacy-keys.txt
index 7d3c07d..f2b1b5c 100644
--- a/proposals/136-legacy-keys.txt
+++ b/proposals/136-legacy-keys.txt
@@ -2,7 +2,7 @@ Filename: 136-legacy-keys.txt
Title: Mass authority migration with legacy keys
Author: Nick Mathewson
Created: 13-May-2008
-Status: Finished
+Status: Closed
Implemented-In: 0.2.0.x
Overview: