[tor-commits] [torspec/master] prop304: Close proposal now merged into our main specs

[asn at torproject.org]

commit 7c222131ba32bc22d3f34baa13eecaa6e8bd7546
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed Nov 20 09:36:39 2019 -0500

    prop304: Close proposal now merged into our main specs
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 proposals/000-index.txt                           | 4 ++--
 proposals/304-socks5-extending-hs-error-codes.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/proposals/000-index.txt b/proposals/000-index.txt
index 6e7b802..44de59f 100644
--- a/proposals/000-index.txt
+++ b/proposals/000-index.txt
@@ -224,7 +224,7 @@ Proposals by number:
 301  Don't include package fingerprints in consensus documents [ACCEPTED]
 302  Hiding onion service clients using padding [CLOSED]
 303  When and how to remove support for protocol versions [DRAFT]
-304  Extending SOCKS5 Onion Service Error Codes [ACCEPTED]
+304  Extending SOCKS5 Onion Service Error Codes [CLOSED]
 305  ESTABLISH_INTRO Cell DoS Defense Extension [DRAFT]
 306  A Tor Implementation of IPv6 Happy Eyeballs [OPEN]
 307  Onion Balance Support for Onion Service v3 [DRAFT]
@@ -275,7 +275,6 @@ Proposals by status:
    288  Privacy-Preserving Statistics with Privcount in Tor (Shamir version)
    292  Mesh-based vanguards
    301  Don't include package fingerprints in consensus documents
-   304  Extending SOCKS5 Onion Service Error Codes
  META:
    000  Index of Tor Proposals
    001  The Tor Proposal Process
@@ -378,6 +377,7 @@ Proposals by status:
    297  Relaxing the protover-based shutdown rules [for 0.3.5.x] [in 0.4.0.x]
    298  Putting family lines in canonical form [for 0.3.6.x] [in 0.4.0.1-alpha]
    302  Hiding onion service clients using padding [in 0.4.1.1-alpha]
+   304  Extending SOCKS5 Onion Service Error Codes
  SUPERSEDED:
    112  Bring Back Pathlen Coin Weight
    113  Simplifying directory authority administration
diff --git a/proposals/304-socks5-extending-hs-error-codes.txt b/proposals/304-socks5-extending-hs-error-codes.txt
index 56a3487..d8ff7d5 100644
--- a/proposals/304-socks5-extending-hs-error-codes.txt
+++ b/proposals/304-socks5-extending-hs-error-codes.txt
@@ -2,7 +2,7 @@ Filename: 304-socks5-extending-hs-error-codes.txt
 Title: Extending SOCKS5 Onion Service Error Codes
 Author: David Goulet, George Kadianakis
 Created: 22-May-2019
-Status: Accepted
+Status: Closed
 
 Note: We are extending SOCKS5 here but in terms, when Tor Browser supports
       HTTPCONNECT, we should not do that anymore.