aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/tor.1.in5
-rw-r--r--src/or/config.c4
2 files changed, 5 insertions, 4 deletions
diff --git a/doc/tor.1.in b/doc/tor.1.in
index 07b7aa99e..15cff919a 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -33,11 +33,12 @@ Options are case-insensitive.
.TP
\fBBandwidthRate \fR\fIN\fR \fBbytes\fR|\fBKB\fR|\fBMB\fR|\fBGB\fR|\fBTB\fP
A token bucket limits the average incoming bandwidth on this node to
-the specified number of bytes per second. (Default: 2 MB)
+the specified number of bytes per second. (Default: 3 MB)
.LP
.TP
\fBBandwidthBurst \fR\fIN\fR \fBbytes\fR|\fBKB\fR|\fBMB\fR|\fBGB\fR|\fBTB\fP
-Limit the maximum token bucket size (also known as the burst) to the given number of bytes. (Default: 5 MB)
+Limit the maximum token bucket size (also known as the burst) to the
+given number of bytes. (Default: 6 MB)
.LP
.TP
\fBMaxAdvertisedBandwidth \fR\fIN\fR \fBbytes\fR|\fBKB\fR|\fBMB\fR|\fBGB\fR|\fBTB\fP
diff --git a/src/or/config.c b/src/or/config.c
index 61e6d98ae..d56f34937 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -128,8 +128,8 @@ static config_var_t _option_vars[] = {
VAR("AuthDirReject", LINELIST, AuthDirReject, NULL),
VAR("AuthDirRejectUnlisted",BOOL, AuthDirRejectUnlisted,"0"),
VAR("AuthoritativeDirectory",BOOL, AuthoritativeDir, "0"),
- VAR("BandwidthBurst", MEMUNIT, BandwidthBurst, "5 MB"),
- VAR("BandwidthRate", MEMUNIT, BandwidthRate, "2 MB"),
+ VAR("BandwidthBurst", MEMUNIT, BandwidthBurst, "6 MB"),
+ VAR("BandwidthRate", MEMUNIT, BandwidthRate, "3 MB"),
VAR("ClientOnly", BOOL, ClientOnly, "0"),
VAR("ConnLimit", UINT, ConnLimit, "1024"),
VAR("ContactInfo", STRING, ContactInfo, NULL),