r16136@catbus: nickm | 2007-10-24 23:40:15 -0400

 Proposal 103 is closed too: it has been implemented and merged into dir-spec.  Proposal 111 is "finished": it has been implemented, but still needs to be merged into the spec.

svn:r12177

diff --git a/doc/spec/proposals/000-index.txt b/doc/spec/proposals/000-index.txt
index 1215a479fd3b5f51603416e9e7e9f6830e268261..501f92e3ac301197a25e3b819cb48f8abf37d1ce 100644 (file)
--- a/doc/spec/proposals/000-index.txt
+++ b/doc/spec/proposals/000-index.txt
@@ -25,7 +25,7 @@ Proposals by number:
 100  Tor Unreliable Datagram Extension Proposal [DEAD]
 101  Voting on the Tor Directory System [CLOSED]
 102  Dropping "opt" from the directory format [CLOSED]
-103  Splitting identity key from regularly used signing key [ACCEPTED]
+103  Splitting identity key from regularly used signing key [CLOSED]
 104  Long and Short Router Descriptors [CLOSED]
 105  Version negotiation for the Tor protocol [OPEN]
 106  Checking fewer things during TLS handshakes [CLOSED]
@@ -33,7 +33,7 @@ Proposals by number:
 108  Base "Stable" Flag on Mean Time Between Failures [CLOSED]
 109  No more than one server per IP address [CLOSED]
 110  Avoiding infinite length circuits [OPEN]
-111  Prioritizing local traffic over relayed traffic [OPEN]
+111  Prioritizing local traffic over relayed traffic [FINISHED]
 112  Bring Back Pathlen Coin Weight [SUPERSEDED]
 113  Simplifying directory authority administration [OPEN]
 114  Distributed Storage for Tor Hidden Service Descriptors [OPEN]
@@ -53,7 +53,6 @@ Proposals by status:
  OPEN:
    105  Version negotiation for the Tor protocol
    110  Avoiding infinite length circuits
-   111  Prioritizing local traffic over relayed traffic
    113  Simplifying directory authority administration
    114  Distributed Storage for Tor Hidden Service Descriptors
    115  Two Hop Paths
@@ -63,7 +62,6 @@ Proposals by status:
    121  Hidden Service Authentication
    123  Naming authorities automatically create bindings
  ACCEPTED:
-   103  Splitting identity key from regularly used signing key
  NEEDS-RESEARCH:
    118  Advertising multiple ORPorts at once
  META:
@@ -71,9 +69,12 @@ Proposals by status:
    001  The Tor Proposal Process
    098  Proposals that should be written
    099  Miscellaneous proposals
+ FINISHED:
+   111  Prioritizing local traffic over relayed traffic
  CLOSED:
    101  Voting on the Tor Directory System
    102  Dropping "opt" from the directory format
+   103  Splitting identity key from regularly used signing key
    104  Long and Short Router Descriptors
    106  Checking fewer things during TLS handshakes
    107  Uptime Sanity Checking

diff --git a/doc/spec/proposals/103-multilevel-keys.txt b/doc/spec/proposals/103-multilevel-keys.txt
index f0b7fac97109b9eb56acc9c74aa469805221d028..a626dbc6783ca27860838f6809e3ab4df468c5da 100644 (file)
--- a/doc/spec/proposals/103-multilevel-keys.txt
+++ b/doc/spec/proposals/103-multilevel-keys.txt
@@ -4,7 +4,7 @@ Version: $Revision$
 Last-Modified: $Date$
 Author: Nick Mathewson
 Created:
-Status: Accepted
+Status: Closed
 
 Overview:
 

diff --git a/doc/spec/proposals/111-local-traffic-priority.txt b/doc/spec/proposals/111-local-traffic-priority.txt
index 2fad554ddbf32f1ba0967362656c0073daccf8b8..37367badf4a30d2888388d631486161ef97a3fa7 100644 (file)
--- a/doc/spec/proposals/111-local-traffic-priority.txt
+++ b/doc/spec/proposals/111-local-traffic-priority.txt
@@ -4,7 +4,7 @@ Version: $Revision$
 Last-Modified: $Date$
 Author: Roger Dingledine
 Created: 14-Mar-2007
-Status: Open
+Status: Finished
 
 Overview:
 

diff --git a/doc/spec/proposals/reindex.pl b/doc/spec/proposals/reindex.pl
index 47b15951d31ae06880d6e30a055a8d98c598e767..c76116434d7736d1ede64fd8cf75e5cc6cbed074 100755 (executable)
--- a/doc/spec/proposals/reindex.pl
+++ b/doc/spec/proposals/reindex.pl
@@ -15,7 +15,7 @@ my %title = ();
 my %status = ();
 
 my @KNOWN_STATUSES = qw{
-    OPEN ACCEPTED NEEDS-RESEARCH META CLOSED SUPERSEDED DEAD};
+    OPEN ACCEPTED NEEDS-RESEARCH META FINISHED CLOSED SUPERSEDED DEAD};
 
 for my $f (@files) {
     my $num = substr($f, 0, 3);