summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Lewman <andrew@torproject.org>2010-06-09 21:04:28 -0400
committerNick Mathewson <nickm@torproject.org>2010-06-10 11:36:33 -0400
commit280dc1f9c7ecb3464599c235c5a50b6e480612b2 (patch)
tree4d2688aef2a50b80de40a2b3423e6b9020d5cca1
parentf7b40f45b733f3a9a483e764b742eb5b5148ce1a (diff)
downloadtor-280dc1f9c7ecb3464599c235c5a50b6e480612b2.tar.gz
tor-280dc1f9c7ecb3464599c235c5a50b6e480612b2.zip
change Bytes to B to fix ticket 1195.
-rw-r--r--src/config/torrc.bridge.in10
-rw-r--r--src/config/torrc.sample.in10
2 files changed, 10 insertions, 10 deletions
diff --git a/src/config/torrc.bridge.in b/src/config/torrc.bridge.in
index 6f1f68d091..e30106beeb 100644
--- a/src/config/torrc.bridge.in
+++ b/src/config/torrc.bridge.in
@@ -95,19 +95,19 @@ Nickname Unnamed
## 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 KBytes.
-#RelayBandwidthRate 100 KBytes # Throttle traffic to 100KB/s (800Kbps)
-#RelayBandwidthBurst 200 KBytes # But allow bursts up to 200KB/s (1600Kbps)
+## be at least 20 KB.
+#RelayBandwidthRate 100 KB # Throttle traffic to 100KB/s (800Kbps)
+#RelayBandwidthBurst 200 KB # But allow bursts up to 200KB/s (1600Kbps)
RelayBandwidthBurst 10485760
RelayBandwidthRate 5242880
## Use these to restrict the maximum traffic per day, week, or month.
## Note that this threshold applies to sent _and_ to received bytes,
-## not to their sum: Setting "4 GBytes" may allow up to 8 GBytes
+## not to their sum: Setting "4 GB" may allow up to 8 GB
## total before hibernating.
##
## Set a maximum of 4 gigabytes each way per period.
-#AccountingMax 4 GBytes
+#AccountingMax 4 GB
## Each period starts daily at midnight (AccountingMax is per day)
#AccountingStart day 00:00
## Each period starts on the 3rd of the month at 15:00 (AccountingMax
diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in
index dbbf19fe90..f0c78ce5a9 100644
--- a/src/config/torrc.sample.in
+++ b/src/config/torrc.sample.in
@@ -95,17 +95,17 @@ SocksListenAddress 127.0.0.1 # accept connections only from localhost
## 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 KBytes.
-#RelayBandwidthRate 100 KBytes # Throttle traffic to 100KB/s (800Kbps)
-#RelayBandwidthBurst 200 KBytes # But allow bursts up to 200KB/s (1600Kbps)
+## be at least 20 KB.
+#RelayBandwidthRate 100 KB # Throttle traffic to 100KB/s (800Kbps)
+#RelayBandwidthBurst 200 KB # But allow bursts up to 200KB/s (1600Kbps)
## Use these to restrict the maximum traffic per day, week, or month.
## Note that this threshold applies to sent _and_ to received bytes,
-## not to their sum: Setting "4 GBytes" may allow up to 8 GBytes
+## not to their sum: Setting "4 GB" may allow up to 8 GB
## total before hibernating.
##
## Set a maximum of 4 gigabytes each way per period.
-#AccountingMax 4 GBytes
+#AccountingMax 4 GB
## Each period starts daily at midnight (AccountingMax is per day)
#AccountingStart day 00:00
## Each period starts on the 3rd of the month at 15:00 (AccountingMax