diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-11-20 12:12:47 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-29 20:48:22 -0400 |
| commit | 35699ef9f5d2814203653e16cb0cd176a0190ae0 (patch) | |
| tree | 319ce13bc5e527b85c554912b8df775371d58007 | |
| parent | 1d3ffc0ec96777203b2eafee5905464d54ef9f91 (diff) | |
| download | tor-35699ef9f5d2814203653e16cb0cd176a0190ae0.tar tor-35699ef9f5d2814203653e16cb0cd176a0190ae0.tar.gz | |
Drop the MaxMemInCellQueues lower limit down to 256 MB.
on #9686, gmorehose reports that the 500 MB lower limit is too high
for raspberry pi users.
This is a backport of 647248729fa65f0e51d062e2af8f4e8b38592bf5 to 0.2.4.
Note that in 0.2.4, the option is called MaxMemInCellQueues.
| -rw-r--r-- | changes/bug9686_024 | 5 | ||||
| -rw-r--r-- | src/or/config.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/changes/bug9686_024 b/changes/bug9686_024 new file mode 100644 index 000000000..8705379d3 --- /dev/null +++ b/changes/bug9686_024 @@ -0,0 +1,5 @@ + o Minor features (security): + - Decrease the lower limit of MaxMemInCellQueues to 256 MBytes (but leave + the default at 8GBytes), to better support Raspberry Pi users. Fixes + bug 9686; bugfix on 0.2.4.14-alpha. + diff --git a/src/or/config.c b/src/or/config.c index ef0294626..85a5e83d5 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2616,10 +2616,10 @@ options_validate(or_options_t *old_options, or_options_t *options, REJECT("If EntryNodes is set, UseEntryGuards must be enabled."); } - if (options->MaxMemInCellQueues < (500 << 20)) { - log_warn(LD_CONFIG, "MaxMemInCellQueues must be at least 500 MB for now. " + if (options->MaxMemInCellQueues < (256 << 20)) { + log_warn(LD_CONFIG, "MaxMemInCellQueues must be at least 256 MB for now. " "Ideally, have it as large as you can afford."); - options->MaxMemInCellQueues = (500 << 20); + options->MaxMemInCellQueues = (256 << 20); } options->AllowInvalid_ = 0; |