diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-24 10:31:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-24 10:31:38 -0400 |
| commit | 67aa3685e7321322cbbc2bef7f87c9a885819af8 (patch) | |
| tree | 46f3678112d650aea4f628b2dd4fe1d7c39c6be0 /doc | |
| parent | aa1ad30fc9c629eea44d715041f29e4838ff3175 (diff) | |
| parent | e3af72647db51e99186b9f284066dedcdc8c10d6 (diff) | |
| download | tor-67aa3685e7321322cbbc2bef7f87c9a885819af8.tar.gz tor-67aa3685e7321322cbbc2bef7f87c9a885819af8.zip | |
Merge branch 'bug11396_v2_squashed'
Conflicts:
src/or/main.c
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 d1556a5541..94c7d40a68 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1761,7 +1761,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 ------------------------ |