Merge branch 'ticket18736'

changes/18736

@@ -0,0 +1,3 @@
+  o Documentation:
+    - Document that onion service subdomains are allowed, and ignored.
+      Closes ticket 18736.

doc/tor.1.txt

@@ -2989,6 +2989,11 @@ __HiddenServiceDirectory__**/hostname**::
     The <base32-encoded-fingerprint>.onion domain name for this hidden service.
     If the hidden service is restricted to authorized clients only, this file
     also contains authorization data for all clients.
+ +
+    Note that clients will ignore any extra subdomains prepended to a hidden
+    service hostname. So if you have "xyz.onion" as your hostname, you
+    can tell clients to connect to "www.xyz.onion" or "irc.xyz.onion"
+    for virtual-hosting purposes.
 
 __HiddenServiceDirectory__**/private_key**::
     The private key for this hidden service.