raise the example bandwidths, and fix a now-broken link
Roger Dingledine

Roger Dingledine commited on 2014-06-10 18:12:20
Zeige 1 geänderte Dateien mit 18 Einfügungen und 12 Löschungen.

... ...
@@ -2187,7 +2187,7 @@ from the source code release tor-0.2.4.16-rc is:
2187 2187
     run a relay?</a></h3>
2188 2188
     <p>
2189 2189
     We're looking for people with reasonably reliable Internet connections,
2190
-    that have at least 20 kilobytes/second each way. If that's you, please
2190
+    that have at least 100 kilobytes/second each way. If that's you, please
2191 2191
     consider <a href="https://www.torproject.org/docs/tor-relay-debian">helping
2192 2192
     out</a>.
2193 2193
     </p>
... ...
@@ -2342,10 +2342,10 @@ too.
2342 2342
     <ul>
2343 2343
     <li>
2344 2344
     BandwidthRate is the maximum long-term bandwidth allowed (bytes per
2345
-    second). For example, you might want to choose "BandwidthRate 2 MB"
2346
-    for 2 megabytes per second (a fast connection), or "BandwidthRate 50
2347
-    KB" for 50 kilobytes per second (a medium-speed cable connection).
2348
-    The minimum BandwidthRate is 20 kilobytes per second.
2345
+    second). For example, you might want to choose "BandwidthRate 10 MBytes"
2346
+    for 10 megabytes per second (a fast connection), or "BandwidthRate 500
2347
+    KBytes" for 500 kilobytes per second (a pretty good cable connection).
2348
+    The minimum BandwidthRate setting is 20 kilobytes per second.
2349 2349
     </li>
2350 2350
     <li>
2351 2351
     BandwidthBurst is a pool of bytes used to fulfill requests during
... ...
@@ -2353,9 +2353,9 @@ too.
2353 2353
     average over a long period to BandwidthRate. A low Rate but a high
2354 2354
     Burst enforces a long-term average while still allowing more traffic
2355 2355
     during peak times if the average hasn't been reached lately. For example,
2356
-    if you choose "BandwidthBurst 50 KB" and also use that for your
2357
-    BandwidthRate, then you will never use more than 50 kilobytes per second;
2358
-    but if you choose a higher BandwidthBurst (like 1 MB), it will allow
2356
+    if you choose "BandwidthBurst 500 KBytes" and also use that for your
2357
+    BandwidthRate, then you will never use more than 500 kilobytes per second;
2358
+    but if you choose a higher BandwidthBurst (like 5 MBytes), it will allow
2359 2359
     more bytes through until the pool is empty.
2360 2360
     </li>
2361 2361
     </ul>
... ...
@@ -2371,7 +2371,7 @@ too.
2371 2371
     Linux-based Tor nodes have another option at their disposal: they can
2372 2372
     prioritize Tor traffic below other traffic on their machine, so that
2373 2373
     their own personal traffic is not impacted by Tor load. A <a
2374
-    href="https://gitweb.torproject.org/tor.git/blob/HEAD:/contrib/linux-tor-prio.sh">script
2374
+    href="https://gitweb.torproject.org/tor.git/blob/HEAD:/contrib/operator-tools/linux-tor-prio.sh">script
2375 2375
     to do this</a> can be found in the Tor source distribution's contrib
2376 2376
     directory.
2377 2377
     </p>
... ...
@@ -2382,7 +2382,7 @@ too.
2382 2382
     href="#LimitTotalBandwidth">hibernation entry</a> below.
2383 2383
     </p>
2384 2384
     <p>
2385
-    Note that BandwidthRate and BandwidthBurst are in <b>Bytes,</b>not Bits.
2385
+    Note that BandwidthRate and BandwidthBurst are in <b>Bytes</b>, not Bits.
2386 2386
     </p>
2387 2387
 
2388 2388
     <hr>
... ...
@@ -2433,12 +2433,18 @@ too.
2433 2433
     end up using your entire monthly quota in the first day. Just divide
2434 2434
     your monthly amount by 30. You might also consider rate limiting to
2435 2435
     spread your usefulness over more of the day: if you want to offer X GB
2436
-    in each direction, you could set your BandwidthRate to 20*X KBytes.
2436
+    in each direction, you could set your RelayBandwidthRate to 20*X KBytes.
2437 2437
     For example,
2438
-    if you have 50 GB to offer each way, you might set your BandwidthRate to
2438
+    if you have 50 GB to offer each way, you might set your RelayBandwidthRate to
2439 2439
     1000 KBytes: this way your relay will always be useful for at least half of
2440 2440
     each day.
2441 2441
     </p>
2442
+    <pre>
2443
+    AccountingStart day 0:00
2444
+    AccountingMax 50 GBytes
2445
+    RelayBandwidthRate 1000 KBytes
2446
+    RelayBandwidthBurst 5000 KBytes # allow higher bursts but maintain average
2447
+    </pre>
2442 2448
 
2443 2449
     <hr>
2444 2450
 
2445 2451