summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2018-02-07 14:05:33 -0500
committerDavid Goulet <dgoulet@torproject.org>2018-02-07 14:05:33 -0500
commit652d3a5b665f8045374eb527494dd9d80ef98d13 (patch)
tree9c2d0065c5b464755ee13daea50e8b044c74022a /doc
parentbf91da75abf84a6a61aa92adc5156ba1d5c15998 (diff)
downloadtor-652d3a5b665f8045374eb527494dd9d80ef98d13.tar.gz
tor-652d3a5b665f8045374eb527494dd9d80ef98d13.zip
Remove anything related to the old SocksSockets option
At this commit, the SocksSocketsGroupWritable option is renamed to UnixSocksGroupWritable. A deprecated warning is triggered if the old option is used and tor will use it properly. Fixes #24343 Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 9a4e70c769..da5f791402 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -238,7 +238,7 @@ GENERAL OPTIONS
[[RelayBandwidthBurst]] **RelayBandwidthBurst** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
If not 0, limit the maximum token bucket size (also known as the burst) for
\_relayed traffic_ to the given number of bytes in each direction.
- They do not include directory fetches by the relay (from authority
+ They do not include directory fetches by the relay (from authority
or other relays), because that is considered "client" activity. (Default: 0)
[[PerConnBWRate]] **PerConnBWRate** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**::
@@ -608,10 +608,10 @@ GENERAL OPTIONS
in accordance to RFC 1929. Both username and password must be between 1 and
255 characters.
-[[SocksSocketsGroupWritable]] **SocksSocketsGroupWritable** **0**|**1**::
+[[UnixSocksGroupWritable]] **UnixSocksGroupWritable** **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)
+ write unix sockets (e.g. SocksPort unix:). If the option is set to 1, make
+ the Unix socket readable and writable by the default GID. (Default: 0)
[[KeepalivePeriod]] **KeepalivePeriod** __NUM__::
To keep firewalls from expiring connections, send a padding keepalive cell