From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 20 Nov 2013 17:12:47 +0000 (-0500)
Subject: Drop the MaxMemInQueues lower limit down to 256 MB.
X-Git-Tag: tor-0.2.5.3-alpha~38^2~8^2~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=647248729fa65f0e51d062e2af8f4e8b38592bf5;p=thirdparty%2Ftor.git

Drop the MaxMemInQueues lower limit down to 256 MB.

on #9686, gmorehose reports that the 500 MB lower limit is too high
for raspberry pi users.
---

diff --git a/changes/bug9686 b/changes/bug9686
new file mode 100644
index 0000000000..82a8f44471
--- /dev/null
+++ b/changes/bug9686
@@ -0,0 +1,3 @@
+  o Minor changes:
+    - Decrease the lower limit of MaxMemInQueues to 256 MBytes, to
+      appease raspberry pi users. Fixes bug 9686.
\ No newline at end of file
diff --git a/src/or/config.c b/src/or/config.c
index 0accb65e5b..01e62d6d42 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3670,10 +3670,10 @@ options_validate(or_options_t *old_options, or_options_t *options,
     log_warn(LD_CONFIG, "EntryNodes is set, but UseEntryGuards is disabled. "
              "EntryNodes will be ignored.");
 
-  if (options->MaxMemInQueues < (500 << 20)) {
-    log_warn(LD_CONFIG, "MaxMemInQueues must be at least 500 MB for now. "
+  if (options->MaxMemInQueues < (256 << 20)) {
+    log_warn(LD_CONFIG, "MaxMemInQueues must be at least 256 MB for now. "
              "Ideally, have it as large as you can afford.");
-    options->MaxMemInQueues = (500 << 20);
+    options->MaxMemInQueues = (256 << 20);
   }
 
   options->_AllowInvalid = 0;