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 /changes/bug11396 | |
| parent | aa1ad30fc9c629eea44d715041f29e4838ff3175 (diff) | |
| parent | e3af72647db51e99186b9f284066dedcdc8c10d6 (diff) | |
| download | tor-67aa3685e7321322cbbc2bef7f87c9a885819af8.tar tor-67aa3685e7321322cbbc2bef7f87c9a885819af8.tar.gz | |
Merge branch 'bug11396_v2_squashed'
Conflicts:
src/or/main.c
Diffstat (limited to 'changes/bug11396')
| -rw-r--r-- | changes/bug11396 | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/changes/bug11396 b/changes/bug11396 new file mode 100644 index 000000000..fd263291d --- /dev/null +++ b/changes/bug11396 @@ -0,0 +1,11 @@ + o Minor features (security): + + - If you don't specify MaxMemInQueues yourself, Tor now tries to + pick a good value based on your total system memory. Previously, + the default was always 8 GB. You can still override the default by + setting MaxMemInQueues yourself. Resolves ticket 11396. + + o Minor features (controller): + - Because of the fix for ticket 11396, the real limit for memory + usage may no longer match the configured MaxMemInQueues value. + The real limit is now exposed via GETINFO limits/max-mem-in-queues. |