diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-06-18 10:23:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-06-18 10:23:03 -0400 |
| commit | d3063da691d0006cf41f6406099f056ab47c543a (patch) | |
| tree | c44651600763ef302359589515e76dfb08cb56d4 /doc | |
| parent | 9e45d940d466bcefcd1490fc2ae0e5a6298a846f (diff) | |
| parent | c37fdc2eef0ccfeff56df5a9b7dfae9396fc643c (diff) | |
| download | tor-d3063da691d0006cf41f6406099f056ab47c543a.tar tor-d3063da691d0006cf41f6406099f056ab47c543a.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
Conflicts:
src/or/config.c
src/or/relay.c
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 56d163bb2..cd67d829f 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1663,6 +1663,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 ------------------------ |