diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-01-26 11:49:41 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-01-26 11:49:41 -0500 |
| commit | 0337fc7b06e0137d483b08a7969a7da708ea404b (patch) | |
| tree | 15c89c87d1e6f5bcd4426d6e2b80fef36859513f /doc | |
| parent | c417210ff3f52a2b0f8783fee807db95d4fe8d93 (diff) | |
| parent | e6da9a98e9697d8d9ad9ef4ea224b09be1f6ce13 (diff) | |
| download | tor-0337fc7b06e0137d483b08a7969a7da708ea404b.tar.gz tor-0337fc7b06e0137d483b08a7969a7da708ea404b.zip | |
Merge remote branch 'origin/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 cfd514292d..65dc76956c 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -927,7 +927,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 |