aboutsummaryrefslogtreecommitdiff
path: root/doc/tor.1.txt
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-01-29 14:56:45 -0500
committerNick Mathewson <nickm@torproject.org>2015-01-29 14:56:45 -0500
commit64bde3ae94f843945bed9f438243de76281bc266 (patch)
treefcc956695ea18ff1995eba06a5d07a45bf96c066 /doc/tor.1.txt
parent4c1a77953942f4921f8a151e01933c8f9d104e7f (diff)
downloadtor-64bde3ae94f843945bed9f438243de76281bc266.tar.gz
tor-64bde3ae94f843945bed9f438243de76281bc266.zip
Document unix: addresses
Diffstat (limited to 'doc/tor.1.txt')
-rw-r--r--doc/tor.1.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 50ab80ecd9..90dad545c7 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -273,7 +273,7 @@ GENERAL OPTIONS
all sockets will be set to this limit. Must be a value between 2048 and
262144, in 1024 byte increments. Default of 8192 is recommended.
-[[ControlPort]] **ControlPort** __PORT__|**auto**::
+[[ControlPort]] **ControlPort** __PORT__|**unix:**__path__|**auto**::
If set, Tor will accept connections on this port and allow those
connections to control the Tor process using the Tor Control Protocol
(described in control-spec.txt). Note: unless you also specify one or
@@ -953,7 +953,7 @@ The following options are useful only for clients (that is, if
the same circuit. Currently, two addresses are "too close" if they lie in
the same /16 range. (Default: 1)
-[[SOCKSPort]] **SOCKSPort** \['address':]__port__|**auto** [_flags_] [_isolation flags_]::
+[[SOCKSPort]] **SOCKSPort** \['address':]__port__|**unix:**__path__|**auto** [_flags_] [_isolation flags_]::
Open this port to listen for connections from SOCKS-speaking
applications. Set this to 0 if you don't want to allow application
connections via SOCKS. Set it to "auto" to have Tor pick a port for