aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-08-11 16:04:22 +0000
committerNick Mathewson <nickm@torproject.org>2008-08-11 16:04:22 +0000
commite65f773952865641ff6ca2f989fc79d699f8c4aa (patch)
tree85376318c2b601499dbe2dad7dc57288f2b6b096 /doc
parent30422b5df1cdad92460d6934d1f9c7b2474a6f0d (diff)
downloadtor-e65f773952865641ff6ca2f989fc79d699f8c4aa.tar.gz
tor-e65f773952865641ff6ca2f989fc79d699f8c4aa.zip
Mark 135 implemented.
svn:r16497
Diffstat (limited to 'doc')
-rw-r--r--doc/spec/proposals/000-index.txt4
-rw-r--r--doc/spec/proposals/135-private-tor-networks.txt3
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/spec/proposals/000-index.txt b/doc/spec/proposals/000-index.txt
index 2747b0fb62..85aabdc1fc 100644
--- a/doc/spec/proposals/000-index.txt
+++ b/doc/spec/proposals/000-index.txt
@@ -57,7 +57,7 @@ Proposals by number:
132 A Tor Web Service For Verifying Correct Browser Configuration [DRAFT]
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 [ACCEPTED]
+135 Simplify Configuration of Private Tor Networks [FINISHED]
136 Mass authority migration with legacy keys [FINISHED]
137 Keep controllers informed as Tor bootstraps [CLOSED]
138 Remove routers that are not Running from consensus documents [CLOSED]
@@ -106,7 +106,6 @@ Proposals by status:
117 IPv6 exits
118 Advertising multiple ORPorts at once
134 More robust consensus voting with diverse authority sets
- 135 Simplify Configuration of Private Tor Networks
140 Provide diffs between consensuses
147 Eliminate the need for v2 directories in generating v3 directories
148 Stream end reasons from the client side should be uniform
@@ -118,6 +117,7 @@ Proposals by status:
FINISHED:
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
diff --git a/doc/spec/proposals/135-private-tor-networks.txt b/doc/spec/proposals/135-private-tor-networks.txt
index fbd0bba645..a10058b398 100644
--- a/doc/spec/proposals/135-private-tor-networks.txt
+++ b/doc/spec/proposals/135-private-tor-networks.txt
@@ -4,8 +4,9 @@ Version: $Revision$
Last-Modified: $Date$
Author: Karsten Loesing
Created: 29-Apr-2008
-Status: Accepted
+Status: Finished
Target: 0.2.1.x
+Implemented-In: 0.2.1.2-alpha
Change history: