[tor-commits] [torspec/master] Merge proposal 204 into addr-spec.txt

[nickm at torproject.org]

commit d44e53a7ebb38e737935ca0c0d443e8d8a8d1f37
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 8 11:52:57 2017 -0500

    Merge proposal 204 into addr-spec.txt
---
 address-spec.txt                     | 4 ++++
 proposals/000-index.txt              | 4 ++--
 proposals/204-hidserv-subdomains.txt | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/address-spec.txt b/address-spec.txt
index 2b361d1..30965ec 100644
--- a/address-spec.txt
+++ b/address-spec.txt
@@ -49,6 +49,7 @@
 3. .onion
 
   SYNTAX:  [digest].onion
+           [ignored].[digest].onion
 
   The digest is the first eighty bits of a SHA1 hash of the identity key for
   a hidden service, encoded in base32.
@@ -56,6 +57,9 @@
   When Tor sees an address in this format, it tries to look up and connect to
   the specified hidden service.  See rend-spec.txt for full details.
 
+  The "ignored" portion of the address is intended for use in vhosting, and
+  is supported in Tor 0.2.4.10-alpha and later.
+
 4. .noconnect
 
   SYNTAX:  [string].noconnect
diff --git a/proposals/000-index.txt b/proposals/000-index.txt
index 6cc4edf..55bf839 100644
--- a/proposals/000-index.txt
+++ b/proposals/000-index.txt
@@ -124,7 +124,7 @@ Proposals by number:
 201  Make bridges report statistics on daily v3 network status requests [OPEN]
 202  Two improved relay encryption protocols for Tor cells [OPEN]
 203  Avoiding censorship by impersonating an HTTPS server [DRAFT]
-204  Subdomain support for Hidden Service addresses [FINISHED]
+204  Subdomain support for Hidden Service addresses [CLOSED]
 205  Remove global client-side DNS caching [CLOSED]
 206  Preconfigured directory sources for bootstrapping [CLOSED]
 207  Directory guards [CLOSED]
@@ -276,7 +276,6 @@ Proposals by status:
    161  Computing Bandwidth Adjustments [for 0.2.1.x]
    162  Publish the consensus in multiple flavors [in 0.2.3.1-alpha]
    196  Extended ORPort and TransportControlPort [for 0.2.4.x]
-   204  Subdomain support for Hidden Service addresses
    217  Tor Extended ORPort Authentication [for 0.2.5.x]
    220  Migrate server identity keys to Ed25519 [for 0.2.x.x]
    232  Pluggable Transport through SOCKS proxy [in 0.2.6]
@@ -328,6 +327,7 @@ Proposals by status:
    193  Safe cookie authentication for Tor controllers
    198  Restore semantics of TLS ClientHello [for 0.2.4.x]
    200  Adding new, extensible CREATE, EXTEND, and related cells [in 0.2.4.8-alpha]
+   204  Subdomain support for Hidden Service addresses
    205  Remove global client-side DNS caching [in 0.2.4.7-alpha.]
    206  Preconfigured directory sources for bootstrapping [in 0.2.4.7-alpha]
    207  Directory guards [for 0.2.4.x]
diff --git a/proposals/204-hidserv-subdomains.txt b/proposals/204-hidserv-subdomains.txt
index a732c39..056fbad 100644
--- a/proposals/204-hidserv-subdomains.txt
+++ b/proposals/204-hidserv-subdomains.txt
@@ -2,7 +2,7 @@ Filename: 204-hidserv-subdomains.txt
 Title: Subdomain support for Hidden Service addresses
 Author: Alessandro Preite Martinez
 Created: 6 July 2012
-Status: Finished
+Status: Closed
 
 
 1. Overview