aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2013-06-18 10:16:47 -0400
committerNick Mathewson <nickm@torproject.org>2013-06-18 10:16:47 -0400
commitc37fdc2eef0ccfeff56df5a9b7dfae9396fc643c (patch)
tree9b3ba35e86f2eedbc3e87ac9348c73d951958223 /doc
parentdc516a543604e081583cbe725bc4b0a89768fc78 (diff)
parent2e1fe1fcf93c2a77805048bea5c535ca4456d583 (diff)
downloadtor-c37fdc2eef0ccfeff56df5a9b7dfae9396fc643c.tar
tor-c37fdc2eef0ccfeff56df5a9b7dfae9396fc643c.tar.gz
Merge branch 'bug9063_redux_023_squashed' into maint-0.2.3
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 773fccf53..1f3afef2a 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1475,6 +1475,15 @@ 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**::
+ 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
+ low, or your relay may be unreliable under load. This option only
+ effects circuit queues, so the actual process size will be larger than
+ this. (Default: 8GB)
+
DIRECTORY SERVER OPTIONS
------------------------