r16135@catbus: nickm | 2007-10-24 23:36:55 -0400

 Proposals 101 and 104 are now implemented and merged into dir-spec.txt.

svn:r12176

diff --git a/doc/spec/proposals/000-index.txt b/doc/spec/proposals/000-index.txt
index 1457420f53f916c24169c0d30c020c430696ed8d..1215a479fd3b5f51603416e9e7e9f6830e268261 100644 (file)
--- a/doc/spec/proposals/000-index.txt
+++ b/doc/spec/proposals/000-index.txt
@@ -23,10 +23,10 @@ Proposals by number:
 098  Proposals that should be written [META]
 099  Miscellaneous proposals [META]
 100  Tor Unreliable Datagram Extension Proposal [DEAD]
-101  Voting on the Tor Directory System [ACCEPTED]
+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]
-104  Long and Short Router Descriptors [ACCEPTED]
+104  Long and Short Router Descriptors [CLOSED]
 105  Version negotiation for the Tor protocol [OPEN]
 106  Checking fewer things during TLS handshakes [CLOSED]
 107  Uptime Sanity Checking [CLOSED]
@@ -63,9 +63,7 @@ Proposals by status:
    121  Hidden Service Authentication
    123  Naming authorities automatically create bindings
  ACCEPTED:
-   101  Voting on the Tor Directory System
    103  Splitting identity key from regularly used signing key
-   104  Long and Short Router Descriptors
  NEEDS-RESEARCH:
    118  Advertising multiple ORPorts at once
  META:
@@ -74,7 +72,9 @@ Proposals by status:
    098  Proposals that should be written
    099  Miscellaneous proposals
  CLOSED:
+   101  Voting on the Tor Directory System
    102  Dropping "opt" from the directory format
+   104  Long and Short Router Descriptors
    106  Checking fewer things during TLS handshakes
    107  Uptime Sanity Checking
    108  Base "Stable" Flag on Mean Time Between Failures

diff --git a/doc/spec/proposals/101-dir-voting.txt b/doc/spec/proposals/101-dir-voting.txt
index a35c9cb1f7b026c2bbb2374ffbe411a89ff9489a..407e44fc44d7fd7b34aaaebe2c7df5324995944a 100644 (file)
--- a/doc/spec/proposals/101-dir-voting.txt
+++ b/doc/spec/proposals/101-dir-voting.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/104-short-descriptors.txt b/doc/spec/proposals/104-short-descriptors.txt
index 9392acb6724b7b431191d01f387444048b4584a5..0a80693f643b47171850f4887f4246ef330b2e1e 100644 (file)
--- a/doc/spec/proposals/104-short-descriptors.txt
+++ b/doc/spec/proposals/104-short-descriptors.txt
@@ -4,7 +4,7 @@ Version: $Revision$
 Last-Modified: $Date$
 Author: Nick Mathewson
 Created:
-Status: Accepted
+Status: Closed
 
 Overview: