diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-02-12 12:44:58 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-02-12 12:44:58 -0500 |
| commit | 87fb1e324c1b3214765c46bec3d9ec6adc3fa83d (patch) | |
| tree | 000e1e6d7d42f160bbd77aaf786a65971696ef19 /doc | |
| parent | 10d4d3e2d58f94418ca9554aee251232bbaaab99 (diff) | |
| parent | 05d8111eedee9e11e4bb1c42e93ae2fc168d52ec (diff) | |
| download | tor-87fb1e324c1b3214765c46bec3d9ec6adc3fa83d.tar tor-87fb1e324c1b3214765c46bec3d9ec6adc3fa83d.tar.gz | |
Merge remote-tracking branch 'public/bug10169_024' into bug10169_025_v2
Conflicts:
src/or/circuitlist.c
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index b571b26cb..7f0465a7e 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1727,13 +1727,13 @@ is non-zero): localhost, RFC1918 addresses, and so on. This can create security issues; you should probably leave it off. (Default: 0) -[[MaxMemInCellQueues]] **MaxMemInCellQueues** __N__ **bytes**|**KB**|**MB**|**GB**:: +[[MaxMemInQueues]] **MaxMemInQueues** __N__ **bytes**|**KB**|**MB**|**GB**:: This option configures a threshold above which Tor will assume that it - needs to stop queueing cells because it's about to run out of memory. - If it hits this threshold, it will begin killing circuits until it - has recovered at least 10% of this memory. Do not set this option too + needs to stop queueing or buffering data because it's about to run out of + memory. If it hits this threshold, it will begin killing circuits until + it has recovered at least 10% of this memory. Do not set this option too low, or your relay may be unreliable under load. This option only - affects circuit queues, so the actual process size will be larger than + affects some queues, so the actual process size will be larger than this. (Default: 8GB) DIRECTORY SERVER OPTIONS |