diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-01-26 11:46:13 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-01-26 11:46:13 -0500 |
| commit | e6da9a98e9697d8d9ad9ef4ea224b09be1f6ce13 (patch) | |
| tree | 31b8c5d27791b82f3df03d392bf0a11a1ccec0bb /doc | |
| parent | 58dfebbcb41b4b13b7aad3cccf85c85e4c6bc2c6 (diff) | |
| parent | 1dd98891d74cbd7e4e64b0943254dc4a78fb658e (diff) | |
| download | tor-e6da9a98e9697d8d9ad9ef4ea224b09be1f6ce13.tar.gz tor-e6da9a98e9697d8d9ad9ef4ea224b09be1f6ce13.zip | |
Merge branch 'bug2181' into maint-0.2.2
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index c8608eb845..8fe73b026b 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -900,7 +900,9 @@ is non-zero): period, or receive more than that number in the period. For example, with AccountingMax set to 1 GB, a server could send 900 MB and receive 800 MB and continue running. It will only hibernate once one of the two reaches 1 - GB. When the number of bytes is exhausted, Tor will hibernate until some + GB. When the number of bytes gets low, Tor will stop accepting new + connections and circuits. When the number of bytes + is exhausted, Tor will hibernate until some time in the next accounting period. To prevent all servers from waking at the same time, Tor will also wait until a random point in each period before waking up. If you have bandwidth cost issues, enabling hibernation |