summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-10-21 12:22:05 -0400
committerNick Mathewson <nickm@torproject.org>2015-10-21 12:22:05 -0400
commit7b859fd8c558c9cf08add79db87fb1cb76537535 (patch)
treee2e26956f0fd64aac8a6f7a639fab2b5dc13f953
parent4fb49069753c37a2425427864212bc3a1f49d980 (diff)
downloadtor-7b859fd8c558c9cf08add79db87fb1cb76537535.tar.gz
tor-7b859fd8c558c9cf08add79db87fb1cb76537535.zip
Note that you can use a unix domain socket for hsport
-rw-r--r--changes/bug173643
-rw-r--r--doc/tor.1.txt4
2 files changed, 5 insertions, 2 deletions
diff --git a/changes/bug17364 b/changes/bug17364
new file mode 100644
index 0000000000..dd9ff12784
--- /dev/null
+++ b/changes/bug17364
@@ -0,0 +1,3 @@
+ o Documentation:
+ - Note that HiddenServicePorts can take a unix domain socket.
+ Closes ticket 17364.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 954c8fa243..5ea5623952 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2176,8 +2176,8 @@ The following options are used to configure a hidden service.
option multiple times; each time applies to the service using the most
recent HiddenServiceDir. By default, this option maps the virtual port to
the same port on 127.0.0.1 over TCP. You may override the target port,
- address, or both by specifying a target of addr, port, or addr:port.
- (You can specify an IPv6 target as [addr]:port.)
+ address, or both by specifying a target of addr, port, addr:port, or
+ **unix:**__path__. (You can specify an IPv6 target as [addr]:port.)
You may also have multiple lines with the same VIRTPORT: when a user
connects to that VIRTPORT, one of the TARGETs from those lines will be
chosen at random.