[tor-commits] [tor/maint-0.2.7] Note that you can use a unix domain socket for hsport

[nickm at torproject.org]

commit 7b859fd8c558c9cf08add79db87fb1cb76537535
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 21 12:22:05 2015 -0400

    Note that you can use a unix domain socket for hsport
---
 changes/bug17364 |    3 +++
 doc/tor.1.txt    |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/changes/bug17364 b/changes/bug17364
new file mode 100644
index 0000000..dd9ff12
--- /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 954c8fa..5ea5623 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.