diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-11-08 19:25:44 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-11-08 19:25:44 -0500 |
| commit | d564187deedb9b8541ab8c83e6c4375ddda66149 (patch) | |
| tree | 22de79bdaac2714a39a9822a7ca4768fa897ef78 /src | |
| parent | c58592e658d6e9d7a99ec61b3746a80e4e6debe0 (diff) | |
| parent | e4ef9f7491ed1495869692b57644885f9772bef5 (diff) | |
| download | tor-d564187deedb9b8541ab8c83e6c4375ddda66149.tar.gz tor-d564187deedb9b8541ab8c83e6c4375ddda66149.zip | |
Merge branch 'maint-0.2.9'
Diffstat (limited to 'src')
| -rw-r--r-- | src/config/torrc.minimal.in-staging | 2 | ||||
| -rw-r--r-- | src/config/torrc.sample.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/config/torrc.minimal.in-staging b/src/config/torrc.minimal.in-staging index 5fa37c18f0..c537c51f9b 100644 --- a/src/config/torrc.minimal.in-staging +++ b/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. diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index d4dfd5f6bb..5328206da9 100644 --- a/src/config/torrc.sample.in +++ b/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. |