Merge remote-tracking branch 'origin/maint-0.2.3' into release-0.2.3release-0.2.3

1 files changed, 9 insertions, 0 deletions

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 773fccf536..1f3afef2ac 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
 ------------------------