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