[tor-commits] [tor/master] Reduce fallback bandwidth requirement to 1 MByte/s

[nickm at torproject.org]

commit 124c342364a354608a6569fa79192c0f92a7f6f5
Author: teor <teor2345 at gmail.com>
Date:   Wed Dec 7 15:58:57 2016 +1100

    Reduce fallback bandwidth requirement to 1 MByte/s
---
 changes/fallbacks-201612            | 2 ++
 scripts/maint/updateFallbackDirs.py | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/changes/fallbacks-201612 b/changes/fallbacks-201612
index 8351642..96ae658 100644
--- a/changes/fallbacks-201612
+++ b/changes/fallbacks-201612
@@ -23,6 +23,8 @@
       Closes ticket 20908.
     - Allow 3 fallbacks per operator. (This is safe now we are choosing 200
       fallbacks.) Closes ticket 20912.
+    - Reduce the minimum fallback bandwidth to 1 MByte/s.
+      Part of #18828.
   o Minor bugfix (fallback directories):
     - Stop failing when OUTPUT_COMMENTS is True in updateFallbackDirs.py.
       Closes ticket 20877; bugfix on commit 9998343 in tor-0.2.8.3-alpha.
diff --git a/scripts/maint/updateFallbackDirs.py b/scripts/maint/updateFallbackDirs.py
index c3488fa..a7c86d0 100755
--- a/scripts/maint/updateFallbackDirs.py
+++ b/scripts/maint/updateFallbackDirs.py
@@ -191,12 +191,12 @@ MAX_FALLBACKS_PER_FAMILY = 3
 EXIT_BANDWIDTH_FRACTION = 1.0
 
 # If a single fallback's bandwidth is too low, it's pointless adding it
-# We expect fallbacks to handle an extra 30 kilobytes per second of traffic
+# We expect fallbacks to handle an extra 10 kilobytes per second of traffic
 # Make sure they can support a hundred times the expected extra load
 # (Use 102.4 to make it come out nicely in MByte/s)
 # We convert this to a consensus weight before applying the filter,
 # because all the bandwidth amounts are specified by the relay
-MIN_BANDWIDTH = 102.4 * 30.0 * 1024.0
+MIN_BANDWIDTH = 102.4 * 10.0 * 1024.0
 
 # Clients will time out after 30 seconds trying to download a consensus
 # So allow fallback directories half that to deliver a consensus