aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2024-05-30 12:31:51 -0400
committerDavid Goulet <dgoulet@torproject.org>2024-05-30 12:31:51 -0400
commit2bc77e62f2f3e45f767c1c02e8435244f38d5b4b (patch)
treefa8cfba1c29c33a9907f946543264575d698db00
parent1c6720a035da08615c54ceda66136f7ac5742d75 (diff)
parent928ba47ddf0fb4112a6895b9c89cc1e13d9c08b8 (diff)
downloadtor-2bc77e62f2f3e45f767c1c02e8435244f38d5b4b.tar.gz
tor-2bc77e62f2f3e45f767c1c02e8435244f38d5b4b.zip
Merge branch 'maint-0.4.8' into release-0.4.8
-rw-r--r--doc/man/tor.1.txt7
1 files changed, 3 insertions, 4 deletions
diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt
index 1589809b1a..ad6ec8ba8d 100644
--- a/doc/man/tor.1.txt
+++ b/doc/man/tor.1.txt
@@ -2795,17 +2795,16 @@ types of statistics that Tor relays collect and publish:
+
A relay is considered overloaded if at least one of these conditions is
met:
- - Onionskins are starting to be dropped.
+ - A certain ratio of ntor onionskins are dropped.
- The OOM was invoked.
+ - TCP Port exhaustion.
- - (Exit only) DNS timeout occurs X% of the time over Y seconds (values
- controlled by consensus parameters, see param-spec.txt).
+
If ExtraInfoStatistics is enabled, it can also put two more specific
overload lines in the extra-info document if at least one of these
conditions is met:
- - TCP Port exhaustion.
- Connection rate limits have been reached (read and write side).
+ - File descriptors are exhausted.
[[PaddingStatistics]] **PaddingStatistics** **0**|**1**::
Relays and bridges only.