aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-09-19 13:03:20 -0400
committerNick Mathewson <nickm@torproject.org>2017-09-19 13:03:20 -0400
commit5f08eb6e57841916b04c05ac55e0900785b1f3a7 (patch)
tree1d14febf6c051e61b7b466825d044e2187864ac8 /doc
parentf395f41868514a0e418c95f3203d59f3aca6fa47 (diff)
parentb74a1c77a4b81ebd8cc63ec108617645d396d9fd (diff)
downloadtor-5f08eb6e57841916b04c05ac55e0900785b1f3a7.tar.gz
tor-5f08eb6e57841916b04c05ac55e0900785b1f3a7.zip
Merge branch 'ticket18736'
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index f669a055c0..2083bb131a 100644
--- a/doc/tor.1.txt
+++ b/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.