diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-05-09 10:00:43 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-05-15 18:18:25 -0400 |
| commit | 739702d077dc724d58e95758f10ba2876b546026 (patch) | |
| tree | 110db94e119a4e51dfb40bf657dae625d65851a9 /proposals | |
| parent | 21caa46a1f2064d60755df3aebf4447edf2189fb (diff) | |
| download | torspec-739702d077dc724d58e95758f10ba2876b546026.tar.gz torspec-739702d077dc724d58e95758f10ba2876b546026.zip | |
Merge prop140 into dir-spec.txt
Diffstat (limited to 'proposals')
| -rw-r--r-- | proposals/000-index.txt | 4 | ||||
| -rw-r--r-- | proposals/140-consensus-diffs.txt | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/proposals/000-index.txt b/proposals/000-index.txt index 2bfebbb..eca98ce 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -60,7 +60,7 @@ Proposals by number: 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] -140 Provide diffs between consensuses [ACCEPTED] +140 Provide diffs between consensuses [CLOSED] 141 Download server descriptors on demand [OBSOLETE] 142 Combine Introduction and Rendezvous Points [DEAD] 143 Improvements of Distributed Storage for Tor Hidden Service Descriptors [SUPERSEDED] @@ -255,7 +255,6 @@ Proposals by status: 276 Report bandwidth with lower granularity in consensus documents [for 0.3.1.x-alpha] 277 Detect multiple relay instances running with same ID [for 0.3.??] ACCEPTED: - 140 Provide diffs between consensuses 172 GETINFO controller option for circuit information 173 GETINFO Option Expansion 188 Bridge Guards and other anti-enumeration defenses @@ -309,6 +308,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] + 140 Provide diffs between consensuses [in 0.3.1.1-alpha] 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] diff --git a/proposals/140-consensus-diffs.txt b/proposals/140-consensus-diffs.txt index 5a8be3f..7793f84 100644 --- a/proposals/140-consensus-diffs.txt +++ b/proposals/140-consensus-diffs.txt @@ -2,7 +2,8 @@ Filename: 140-consensus-diffs.txt Title: Provide diffs between consensuses Author: Peter Palfrader Created: 13-Jun-2008 -Status: Accepted +Implemented-In: 0.3.1.1-alpha +Status: Closed 0. History |