aboutsummaryrefslogtreecommitdiff
path: root/proposals
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-12-12 20:30:45 +0000
committerNick Mathewson <nickm@torproject.org>2008-12-12 20:30:45 +0000
commitb282cd4b75b0f97e29f2c25b15cb39fb540cd931 (patch)
treebdecf8fc86e470472909e3b7afb20d1d5c26ad8f /proposals
parentb66d09e7587d1865abea8d1a5f26036d1c5d4d5c (diff)
downloadtorspec-b282cd4b75b0f97e29f2c25b15cb39fb540cd931.tar.gz
torspec-b282cd4b75b0f97e29f2c25b15cb39fb540cd931.zip
Merge 148 into tor-spec, mark it Closed, and check off proposal 148 in TODO.021
svn:r17613
Diffstat (limited to 'proposals')
-rw-r--r--proposals/000-index.txt4
-rw-r--r--proposals/148-uniform-client-end-reason.txt4
2 files changed, 4 insertions, 4 deletions
diff --git a/proposals/000-index.txt b/proposals/000-index.txt
index e253854..9a6ef40 100644
--- a/proposals/000-index.txt
+++ b/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/proposals/148-uniform-client-end-reason.txt b/proposals/148-uniform-client-end-reason.txt
index fa4c24f..cec8125 100644
--- a/proposals/148-uniform-client-end-reason.txt
+++ b/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