[tor-commits] [torspec/master] Mark prop#263 as made obsolete by prop#269.

[isis at torproject.org]

commit a26519834d31036d8dc68677f4acbd4fb7e1b00b
Author: Isis Lovecruft <isis at torproject.org>
Date:   Fri Jul 22 11:47:31 2016 +0000

    Mark prop#263 as made obsolete by prop#269.
---
 proposals/000-index.txt                 | 4 ++--
 proposals/263-ntru-for-pq-handshake.txt | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/proposals/000-index.txt b/proposals/000-index.txt
index 316ac32..c794db7 100644
--- a/proposals/000-index.txt
+++ b/proposals/000-index.txt
@@ -183,7 +183,7 @@ Proposals by number:
 260  Rendezvous Single Onion Services [DRAFT]
 261  AEZ for relay cryptography [OPEN]
 262  Re-keying live circuits with new cryptographic material [OPEN]
-263  Request to change key exchange protocol for handshake v1.2 [OPEN]
+263  Request to change key exchange protocol for handshake v1.2 [OBSOLETE]
 264  Putting version numbers on the Tor subprotocols [OPEN]
 265  Load Balancing with Overhead Parameters [ACCEPTED]
 266  Removing current obsolete clients from the Tor network [DRAFT]
@@ -246,7 +246,6 @@ Proposals by status:
    256  Key revocation for relays and authorities
    261  AEZ for relay cryptography
    262  Re-keying live circuits with new cryptographic material
-   263  Request to change key exchange protocol for handshake v1.2
    264  Putting version numbers on the Tor subprotocols
  ACCEPTED:
    140  Provide diffs between consensuses
@@ -376,6 +375,7 @@ Proposals by status:
    141  Download server descriptors on demand
    144  Increase the diversity of circuits by detecting nodes belonging the same provider
    199  Integration of BridgeFinder and BridgeFinderHelper
+   263  Request to change key exchange protocol for handshake v1.2
  RESERVE:
    133  Incorporate Unreachable ORs into the Tor Network
    211  Internal Mapaddress for Tor Configuration Testing [for 0.2.4.x+]
diff --git a/proposals/263-ntru-for-pq-handshake.txt b/proposals/263-ntru-for-pq-handshake.txt
index a6732b6..6a3353e 100644
--- a/proposals/263-ntru-for-pq-handshake.txt
+++ b/proposals/263-ntru-for-pq-handshake.txt
@@ -3,7 +3,10 @@ Title: Request to change key exchange protocol for handshake v1.2
 Author: John SCHANCK, William WHYTE and Zhenfei ZHANG
 Created: 29 Aug 2015
 Updated: 4 Feb 2016
-Status: Open
+Status: Obsolete
+
+This proposal was made obsolete by proposal #269.
+
 
 1. Introduction