diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-02-15 21:05:08 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-02-15 21:05:08 -0500 |
| commit | d662d4470a9030ad485dde1eb5426f063f9c3cf1 (patch) | |
| tree | 220bf6c94835d5cf788e515e7809340722213292 /doc/tor.1.txt | |
| parent | 799c82be70edaf67ea9904e426cde5213b16f4b7 (diff) | |
| parent | 652d3a5b665f8045374eb527494dd9d80ef98d13 (diff) | |
| download | tor-d662d4470a9030ad485dde1eb5426f063f9c3cf1.tar.gz tor-d662d4470a9030ad485dde1eb5426f063f9c3cf1.zip | |
Merge remote-tracking branch 'dgoulet/ticket24343_033_01' into maint-0.3.3
Diffstat (limited to 'doc/tor.1.txt')
| -rw-r--r-- | doc/tor.1.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 2c8135ff05..ad6d941587 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 |