aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/spec/proposals/000-index.txt8
-rw-r--r--doc/spec/proposals/124-tls-certificates.txt2
-rw-r--r--doc/spec/proposals/130-v2-conn-protocol.txt (renamed from doc/spec/proposals/ideas/xxx-v2-conn-protocol.txt)8
3 files changed, 12 insertions, 6 deletions
diff --git a/doc/spec/proposals/000-index.txt b/doc/spec/proposals/000-index.txt
index e8d59a5a3..f6fe49a09 100644
--- a/doc/spec/proposals/000-index.txt
+++ b/doc/spec/proposals/000-index.txt
@@ -46,11 +46,13 @@ Proposals by number:
121 Hidden Service Authentication [OPEN]
122 Network status entries need a new Unnamed flag [CLOSED]
123 Naming authorities automatically create bindings [OPEN]
-124 Blocking resistant TLS certificate usage [ACCEPTED]
+124 Blocking resistant TLS certificate usage [SUPERSEDED]
125 Behavior for bridge users, bridge relays, and bridge authorities [OPEN]
126 Getting GeoIP data and publishing usage summaries [OPEN]
127 Relaying dirport requests to Tor download site / website [DRAFT]
128 Families of private bridges [DRAFT]
+129 Block Insecure Protocols by Default [OPEN]
+130 Version 2 Tor connection protocol [OPEN]
Proposals by status:
@@ -66,9 +68,10 @@ Proposals by status:
123 Naming authorities automatically create bindings
125 Behavior for bridge users, bridge relays, and bridge authorities
126 Getting GeoIP data and publishing usage summaries
+ 129 Block Insecure Protocols by Default
+ 130 Version 2 Tor connection protocol
ACCEPTED:
105 Version negotiation for the Tor protocol
- 124 Blocking resistant TLS certificate usage
NEEDS-RESEARCH:
118 Advertising multiple ORPorts at once
META:
@@ -92,6 +95,7 @@ Proposals by status:
122 Network status entries need a new Unnamed flag
SUPERSEDED:
112 Bring Back Pathlen Coin Weight
+ 124 Blocking resistant TLS certificate usage
DEAD:
100 Tor Unreliable Datagram Extension Proposal
DRAFT:
diff --git a/doc/spec/proposals/124-tls-certificates.txt b/doc/spec/proposals/124-tls-certificates.txt
index bbad5af1a..3f1014943 100644
--- a/doc/spec/proposals/124-tls-certificates.txt
+++ b/doc/spec/proposals/124-tls-certificates.txt
@@ -4,7 +4,7 @@ Version: $Revision$
Last-Modified: $Date$
Author: Steven J. Murdoch
Created: 2007-10-25
-Status: Accepted
+Status: Superseded
Overview:
diff --git a/doc/spec/proposals/ideas/xxx-v2-conn-protocol.txt b/doc/spec/proposals/130-v2-conn-protocol.txt
index 9816cba5f..c17c982ac 100644
--- a/doc/spec/proposals/ideas/xxx-v2-conn-protocol.txt
+++ b/doc/spec/proposals/130-v2-conn-protocol.txt
@@ -1,10 +1,10 @@
-Filename: xxx-v2-conn-protocol.txt
+Filename: 130-v2-conn-protocol.txt
Title: Version 2 Tor connection protocol
Version: $Revision$
Last-Modified: $Date$
Author: Nick Mathewson
Created: 2007-10-25
-Status: Draft
+Status: Open
Overview:
@@ -98,7 +98,9 @@ Proposal:
renegotiation. This time, the server continues with two certificates
as usual, and asks for certificates so that the client will send
certificates of its own. Because the TLS connection has been
- established, all of this is encrypted.
+ established, all of this is encrypted. (The certificate sent by the
+ server in the renegotiated connection need not be the same that
+ as sentin the original connection.)
The server MUST NOT write any data until the client has renegotiated.