summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2012-09-05 16:41:43 -0400
committerRoger Dingledine <arma@torproject.org>2012-09-05 16:41:43 -0400
commit6f82ae44cb85e61a729ccb7ce47451dae97e8602 (patch)
treebb5fd7b60722fd522c2d921873fd644f9da3c4e6
parentf8c1ab7bbf7e7f4528406ae5ba7837866642549d (diff)
parent97dbff51e60273b29d7dc15e4106c600e8efa34e (diff)
downloadtor-6f82ae44cb85e61a729ccb7ce47451dae97e8602.tar.gz
tor-6f82ae44cb85e61a729ccb7ce47451dae97e8602.zip
Merge branch 'maint-0.2.3'
-rw-r--r--doc/tor.1.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 9a8de25921..cae9bf338e 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -128,8 +128,8 @@ GENERAL OPTIONS
A token bucket limits the average incoming bandwidth usage on this node to
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_ 20 KB (that is,
- 20480 bytes). (Default: 5 MB)
+ public network, this needs to be _at the very least_ 30 KB (that is,
+ 30720 bytes). (Default: 5 MB)
**BandwidthBurst** __N__ **bytes**|**KB**|**MB**|**GB**::
Limit the maximum token bucket size (also known as the burst) to the given