diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-12-09 13:57:23 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-12-09 13:57:23 +0000 |
| commit | eb19ddb0207f3ca90cad9704210fe1a9b222eb3c (patch) | |
| tree | e25a06db7b1bbb71ce95af2349635f202d767921 /doc/spec/proposals | |
| parent | 0121caef61abb0d8e2d0e6cc92aaadf507603387 (diff) | |
| download | tor-eb19ddb0207f3ca90cad9704210fe1a9b222eb3c.tar tor-eb19ddb0207f3ca90cad9704210fe1a9b222eb3c.tar.gz | |
Merge proposal 136 into dir-spec.txt. We need to get better about doing this.
svn:r17528
Diffstat (limited to 'doc/spec/proposals')
| -rw-r--r-- | doc/spec/proposals/000-index.txt | 4 | ||||
| -rw-r--r-- | doc/spec/proposals/136-legacy-keys.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/spec/proposals/000-index.txt b/doc/spec/proposals/000-index.txt index 331a5ae8e..b0edd73a2 100644 --- a/doc/spec/proposals/000-index.txt +++ b/doc/spec/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/doc/spec/proposals/136-legacy-keys.txt b/doc/spec/proposals/136-legacy-keys.txt index 7d3c07dfb..f2b1b5c7f 100644 --- a/doc/spec/proposals/136-legacy-keys.txt +++ b/doc/spec/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: |