diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-01-03 10:53:22 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-01-03 10:53:22 -0500 |
| commit | 5c45a333c3cdfc4c7a817425a1c3ae88085c389b (patch) | |
| tree | f6a7db91df7b7fc7cb0ce2e31bc9d8bcde549128 /doc | |
| parent | 35115496511f64c08849a039c926910739467169 (diff) | |
| parent | 647248729fa65f0e51d062e2af8f4e8b38592bf5 (diff) | |
| download | tor-5c45a333c3cdfc4c7a817425a1c3ae88085c389b.tar tor-5c45a333c3cdfc4c7a817425a1c3ae88085c389b.tar.gz | |
Merge remote-tracking branch 'public/bug10169_023' into bug10169_024
Conflicts:
doc/tor.1.txt
src/or/config.c
src/or/or.h
The conflicts were all pretty trivial.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 3f8f6da03..a60004121 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1679,13 +1679,13 @@ is non-zero): localhost, RFC1918 addresses, and so on. This can create security issues; you should probably leave it off. (Default: 0) -[[MaxMemInCellQueues]] **MaxMemInCellQueues** __N__ **bytes**|**KB**|**MB**|**GB**:: +[[MaxMemInQueues]] **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 - affects 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 |