aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-11-20 12:08:14 -0500
committerNick Mathewson <nickm@torproject.org>2013-11-20 12:12:23 -0500
commite572ec856dff263d7f43ec6d42fe3fc3b7557f73 (patch)
treedf9697940769c1effc539a2bbd35894b518a2dd4 /doc
parent03ff21b018c8d0b005d2a60c3ba2bf08d6cb00bb (diff)
downloadtor-e572ec856dff263d7f43ec6d42fe3fc3b7557f73.tar
tor-e572ec856dff263d7f43ec6d42fe3fc3b7557f73.tar.gz
Rename MaxMemInCellQueues to MaxMemInQueues
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 1f3afef2a..01f0be75e 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1475,13 +1475,13 @@ is non-zero):
localhost, RFC1918 addresses, and so on. This can create security issues;
you should probably leave it off. (Default: 0)
-**MaxMemInCellQueues** __N__ **bytes**|**KB**|**MB**|**GB**::
+**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
- effects 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