diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-06-18 10:25:30 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-06-18 10:25:30 -0400 |
| commit | b5d1fded3dfa836ef1f45f6acb74971f75d5caa9 (patch) | |
| tree | ce22de55ffa508033064f7e6165590c00028f459 /doc | |
| parent | 2974c83735d2ac473fcffea0ff3b453e900d5854 (diff) | |
| parent | efa342f5fa2c6700ed8273557b7fb39bdc577120 (diff) | |
| download | tor-b5d1fded3dfa836ef1f45f6acb74971f75d5caa9.tar tor-b5d1fded3dfa836ef1f45f6acb74971f75d5caa9.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.4'
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 37d374b94..aa37f1baf 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 ------------------------ |