diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-03-04 11:03:30 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-03-04 11:03:30 -0500 |
| commit | ab225aaf28d7a25a58b5f11f1c59ded80570b594 (patch) | |
| tree | 2cef1ba108879d507296d6a089f9cebc5237fad8 /doc | |
| parent | bfa0e022bc6ec629473d3dfb598cad698ceee256 (diff) | |
| parent | bb375442141b4a5b301212394ce3e106cb34daf2 (diff) | |
| download | tor-ab225aaf28d7a25a58b5f11f1c59ded80570b594.tar.gz tor-ab225aaf28d7a25a58b5f11f1c59ded80570b594.zip | |
Merge branch 'bug10169_025_v2'
Conflicts:
src/test/test.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 2b6de2ab61..14d477d01b 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 |