diff options
| author | Roger Dingledine <arma@torproject.org> | 2012-09-10 03:03:06 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2012-09-10 03:03:06 -0400 |
| commit | e1e34ee4e409b044eed3164a20f388a2d3580fd6 (patch) | |
| tree | d12491cffaf3c76eada062f624389ff7c3f54297 | |
| parent | f6639d5676f34234afaec9b49c89735724f7f67e (diff) | |
| download | tor-e1e34ee4e409b044eed3164a20f388a2d3580fd6.tar.gz tor-e1e34ee4e409b044eed3164a20f388a2d3580fd6.zip | |
raise bandwidthrate/bandwidthburst to a new "infinite"
addresses bug 6605.
| -rw-r--r-- | changes/bug6605 | 7 | ||||
| -rw-r--r-- | doc/tor.1.txt | 4 | ||||
| -rw-r--r-- | src/or/config.c | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/changes/bug6605 b/changes/bug6605 new file mode 100644 index 0000000000..92fac1954b --- /dev/null +++ b/changes/bug6605 @@ -0,0 +1,7 @@ + o Major bugfixes: + - Raise the default BandwidthRate/BandwidthBurst values from 1MB/5MB + to 1GB/1GB. The previous defaults were intended to be "basically + infinite", but it turns out they're now limiting our 100mbit+ + relays and bridges. Fixes bug 6605; bugfix on 0.2.0.10-alpha (the + last time we raised it). + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index cae9bf338e..cf5945df11 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -129,11 +129,11 @@ GENERAL OPTIONS the specified number of bytes per second, and the average outgoing bandwidth usage to that same value. If you want to run a relay in the public network, this needs to be _at the very least_ 30 KB (that is, - 30720 bytes). (Default: 5 MB) + 30720 bytes). (Default: 1 GB) **BandwidthBurst** __N__ **bytes**|**KB**|**MB**|**GB**:: Limit the maximum token bucket size (also known as the burst) to the given - number of bytes in each direction. (Default: 10 MB) + number of bytes in each direction. (Default: 1 GB) **MaxAdvertisedBandwidth** __N__ **bytes**|**KB**|**MB**|**GB**:: If set, we will not advertise more than this amount of bandwidth for our diff --git a/src/or/config.c b/src/or/config.c index 7dd4539d4b..61fd99342f 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -209,8 +209,8 @@ static config_var_t _option_vars[] = { V(AutomapHostsOnResolve, BOOL, "0"), V(AutomapHostsSuffixes, CSV, ".onion,.exit"), V(AvoidDiskWrites, BOOL, "0"), - V(BandwidthBurst, MEMUNIT, "10 MB"), - V(BandwidthRate, MEMUNIT, "5 MB"), + V(BandwidthBurst, MEMUNIT, "1 GB"), + V(BandwidthRate, MEMUNIT, "1 GB"), V(BridgeAuthoritativeDir, BOOL, "0"), VAR("Bridge", LINELIST, Bridges, NULL), V(BridgePassword, STRING, NULL), |