From f8b9a8d457eb3975d665c8f66f84a69c19b2acf9 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Sat, 28 Jan 2006 08:28:15 +0000 Subject: [PATCH] bump the default bandwidthrate to 3 MB, and burst to 6 MB svn:r5874 --- doc/tor.1.in | 5 +++-- src/or/config.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/tor.1.in b/doc/tor.1.in index 07b7aa99e6..15cff919a8 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 61e6d98ae9..d56f349370 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),