Explorar o código

Merge branch 'maint-0.2.9'

Nick Mathewson %!s(int64=9) %!d(string=hai) anos
pai
achega
d564187dee
Modificáronse 3 ficheiros con 6 adicións e 2 borrados
  1. 4 0
      changes/bug20085
  2. 1 1
      src/config/torrc.minimal.in-staging
  3. 1 1
      src/config/torrc.sample.in

+ 4 - 0
changes/bug20085

@@ -0,0 +1,4 @@
+  o Documentation:
+    - Correct the minimum bandwidth value in torrc.sample, and queue a
+      corresponding change for torrc.minimal. Closes ticket 20085.
+

+ 1 - 1
src/config/torrc.minimal.in-staging

@@ -105,7 +105,7 @@
 
 ## Define these to limit how much relayed traffic you will allow. Your
 ## own traffic is still unthrottled. Note that RelayBandwidthRate must
-## be at least 20 kilobytes per second.
+## be at least 75 kilobytes per second.
 ## Note that units for these config options are bytes (per second), not
 ## bits (per second), and that prefixes are binary prefixes, i.e. 2^10,
 ## 2^20, etc.

+ 1 - 1
src/config/torrc.sample.in

@@ -104,7 +104,7 @@
 
 ## Define these to limit how much relayed traffic you will allow. Your
 ## own traffic is still unthrottled. Note that RelayBandwidthRate must
-## be at least 20 kilobytes per second.
+## be at least 75 kilobytes per second.
 ## Note that units for these config options are bytes (per second), not
 ## bits (per second), and that prefixes are binary prefixes, i.e. 2^10,
 ## 2^20, etc.