diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-03 12:06:44 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-24 10:26:14 -0400 |
| commit | 17ecd04fde2fd98b0cca3afb251b7173e22d3f42 (patch) | |
| tree | 5e353b035c9506a47021c760b1dbe0a1b3ebafee /doc | |
| parent | aca05fc5c08d6296c4f93850a0256bfd96890b18 (diff) | |
| download | tor-17ecd04fde2fd98b0cca3afb251b7173e22d3f42.tar tor-17ecd04fde2fd98b0cca3afb251b7173e22d3f42.tar.gz | |
Change the logic for the default for MaxMemInQueues
If we can't detect the physical memory, the new default is 8 GB on
64-bit architectures, and 1 GB on 32-bit architectures.
If we *can* detect the physical memory, the new default is
CLAMP(256 MB, phys_mem * 0.75, MAX_DFLT)
where MAX_DFLT is 8 GB on 64-bit architectures and 2 GB on 32-bit
architectures.
You can still override the default by hand. The logic here is simply
trying to choose a lower default value on systems with less than 12 GB
of physical RAM.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 1cc8f841c..319921f0c 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1752,7 +1752,8 @@ is non-zero): 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 some queues, so the actual process size will be larger than - this. (Default: 8GB) + this. If this option is set to 0, Tor will try to pick a reasonable + default based on your system's physical memory. (Default: 0) DIRECTORY SERVER OPTIONS ------------------------ |