diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-11-29 17:52:23 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-11-29 17:52:23 -0500 |
| commit | 83f66db79ec6469beea0fb410be6536acb90ffd0 (patch) | |
| tree | 8fedd246085e64d91e9a08a9bddb624159aeeffe /doc | |
| parent | 9e25422eed03ad5fe8f54653fbc74668561f43a1 (diff) | |
| parent | 9e8f3ee8e4d5ad5ce98aeb37b2b8c724a1936355 (diff) | |
| download | tor-83f66db79ec6469beea0fb410be6536acb90ffd0.tar.gz tor-83f66db79ec6469beea0fb410be6536acb90ffd0.zip | |
Merge branch 'disable_network'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 7f9bfbbf9a..5e2a1e4e61 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -125,6 +125,12 @@ Other options can be specified either on the command-line (--option You probably don't need to adjust this. It has no effect on Windows since that platform lacks getrlimit(). (Default: 1000) +**DisableNetwork** **0**|**1**:: + When this option is set, we don't listen for or accept any connections + other than controller connections, and we don't make any outbound + connections. Controllers sometimes use this option to avoid using + the network until Tor is fully configured. (Default: 0) + **ConstrainedSockets** **0**|**1**:: If set, Tor will tell the kernel to attempt to shrink the buffers for all sockets to the size specified in **ConstrainedSockSize**. This is useful for |