summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorJacob Appelbaum <jacob@appelbaum.net>2014-08-11 12:27:04 -0700
committerAndrea Shepard <andrea@torproject.org>2015-01-07 17:42:57 +0000
commit8d59ddf3cba541c6578dff121e8f0623a7606bab (patch)
treea85c724acac38346025042b128c60f20337dda05 /doc
parent1abd526c75eade83318a6ec6aff84d5f0f079a3b (diff)
downloadtor-8d59ddf3cba541c6578dff121e8f0623a7606bab.tar.gz
tor-8d59ddf3cba541c6578dff121e8f0623a7606bab.zip
Commit second draft of Jake's SOCKS5-over-AF_UNIX patch. See ticket #12585.
Signed-off-by: Andrea Shepard <andrea@torproject.org>
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 9e86a67359..43aade9d9e 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -483,6 +483,15 @@ GENERAL OPTIONS
in accordance to RFC 1929. Both username and password must be between 1 and
255 characters.
+[[SocksSocket]] **SocksSocket** __Path__::
+ Like SocksPort, but listens on a Unix domain socket, rather than a TCP
+ socket. (Unix and Unix-like systems only.)
+
+[[SocksSocketsGroupWritable]] **SocksSocketsGroupWritable** **0**|**1**::
+ If this option is set to 0, don't allow the filesystem group to read and
+ write unix sockets (e.g. SocksSocket). If the option is set to 1, make
+ the SocksSocket socket readable and writable by the default GID. (Default: 0)
+
[[KeepalivePeriod]] **KeepalivePeriod** __NUM__::
To keep firewalls from expiring connections, send a padding keepalive cell
every NUM seconds on open connections that are in use. If the connection