Merge 148 into tor-spec, mark it Closed, and check off proposal 148 in TODO.021

svn:r17613

4 files changed, 9 insertions, 6 deletions

diff --git a/doc/TODO.021 b/doc/TODO.021
index 64121f7fde..745c998780 100644
--- a/doc/TODO.021
+++ b/doc/TODO.021
@@ -161,7 +161,7 @@ R   o 128: families of private bridges
     o 135: simplify configuration of private tor networks.
 K   - 143: Improvements of Distributed Hidden Service Descriptor Storage:
            only easy parts for 0.2.1.x, defer complex ones to 0.2.2.x.
-    * 148: Stream end reasons from the client side should be uniform.
+    o 148: Stream end reasons from the client side should be uniform.
 K   o 155: Four Improvements of Hidden Service Performance
     - 145: Separate "suitable from a guard" from "suitable as a new guard"
     - 146: Adding new flag to reflect long-term stability
@@ -170,7 +170,7 @@ K   o 155: Four Improvements of Hidden Service Performance
         mismatched address.
       - Learn our outgoing IP address from netinfo cells?
       - Learn skew from netinfo cells?
-    * 157: Make certificate downloads specific.
+    o 157: Make certificate downloads specific.
 
   - Proposals to write:
     - Fix voting to handle bug 608 case when multiple servers get
diff --git a/doc/spec/proposals/000-index.txt b/doc/spec/proposals/000-index.txt
index e253854c3d..9a6ef40a89 100644
--- a/doc/spec/proposals/000-index.txt
+++ b/doc/spec/proposals/000-index.txt
@@ -70,7 +70,7 @@ Proposals by number:
 145  Separate "suitable as a guard" from "suitable as a new guard" [OPEN]
 146  Add new flag to reflect long-term stability [OPEN]
 147  Eliminate the need for v2 directories in generating v3 directories [ACCEPTED]
-148  Stream end reasons from the client side should be uniform [ACCEPTED]
+148  Stream end reasons from the client side should be uniform [CLOSED]
 149  Using data from NETINFO cells [OPEN]
 150  Exclude Exit Nodes from a circuit [CLOSED]
 151  Improving Tor Path Selection [DRAFT]
@@ -106,7 +106,6 @@ Proposals by status:
    134  More robust consensus voting with diverse authority sets [for 0.2.1.x]
    140  Provide diffs between consensuses [for 0.2.1.x]
    147  Eliminate the need for v2 directories in generating v3 directories [for 0.2.1.x]
-   148  Stream end reasons from the client side should be uniform [for 0.2.1.x]
    157  Make certificate downloads specific [for 0.2.1.x]
  META:
    000  Index of Tor Proposals
@@ -140,6 +139,7 @@ Proposals by status:
    137  Keep controllers informed as Tor bootstraps [in 0.2.1.x]
    138  Remove routers that are not Running from consensus documents [in 0.2.1.2-alpha]
    139  Download consensus documents only when it will be trusted [in 0.2.1.x]
+   148  Stream end reasons from the client side should be uniform [in 0.2.1.9-alpha]
    150  Exclude Exit Nodes from a circuit [in 0.2.1.3-alpha]
    152  Optionally allow exit from single-hop circuits [in 0.2.1.6-alpha]
  SUPERSEDED:
diff --git a/doc/spec/proposals/148-uniform-client-end-reason.txt b/doc/spec/proposals/148-uniform-client-end-reason.txt
index fa4c24f371..cec81253ea 100644
--- a/doc/spec/proposals/148-uniform-client-end-reason.txt
+++ b/doc/spec/proposals/148-uniform-client-end-reason.txt
@@ -4,8 +4,8 @@ Version: $Revision$
 Last-Modified: $Date$
 Author: Roger Dingledine
 Created: 2-Jul-2008
-Status: Accepted
-Target: 0.2.1.x
+Status: Closed
+Implemented-In: 0.2.1.9-alpha
 
 Overview
 
diff --git a/doc/spec/tor-spec.txt b/doc/spec/tor-spec.txt
index d514ad1eaa..8dfa0da710 100644
--- a/doc/spec/tor-spec.txt
+++ b/doc/spec/tor-spec.txt
@@ -826,6 +826,9 @@ see tor-design.pdf.
    OPs and ORs MUST accept reasons not on the above list, since future
    versions of Tor may provide more fine-grained reasons.
 
+   Tors SHOULD NOT send any reason except REASON_MISC for a stream that they
+   have originated.
+
    [*] Older versions of Tor also send this reason when connections are
        reset.
    [**] Due to a bug in versions of Tor through 0095, error reason 8 must