commit 6a649ca3f34c404c3be9107f63bb1011126facc1 Merge: 6bd0a69 1cb56af Author: Nick Mathewson nickm@torproject.org Date: Fri Feb 9 08:38:25 2018 -0500
Merge branch 'document_prop278'
dir-spec.txt | 34 ++++++++++++++++------ proposals/000-index.txt | 4 +-- ...78-directory-compression-scheme-negotiation.txt | 2 +- 3 files changed, 28 insertions(+), 12 deletions(-)
diff --cc proposals/000-index.txt index 688e2f7,7cfde0f..86fab75 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@@ -287,7 -287,7 +287,6 @@@ Proposals by status 217 Tor Extended ORPort Authentication [for 0.2.5.x] 232 Pluggable Transport through SOCKS proxy [in 0.2.6] 260 Rendezvous Single Onion Services [in 0.2.9.3-alpha] - 278 Directory Compression Scheme Negotiation [in 0.3.1.1-alpha] - 284 Hidden Service v3 Control Port CLOSED: 101 Voting on the Tor Directory System [in 0.2.0.x] 102 Dropping "opt" from the directory format [in 0.2.0.x] @@@ -367,7 -367,7 +366,8 @@@ 271 Another algorithm for guard selection [in 0.3.0.1-alpha] 272 Listed routers should be Valid, Running, and treated as such [in 0.2.9.3-alpha, 0.2.9.4-alpha] 274 Rotate onion keys less frequently [in 0.3.1.1-alpha] + 278 Directory Compression Scheme Negotiation [in 0.3.1.1-alpha] + 284 Hidden Service v3 Control Port SUPERSEDED: 112 Bring Back Pathlen Coin Weight 113 Simplifying directory authority administration