summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-04-19 12:00:41 +1000
committerteor <teor@torproject.org>2019-04-19 12:00:41 +1000
commit231036a110c1062e39b214b4b88fdc2a1eb46dc8 (patch)
tree9265e0873c59cb48d90d047b3a277bf81f4f3c00 /doc
parent742b5b32d502712c7ad6d75adbf25fca6986c898 (diff)
parentcbce8dedd3703424111928d68dfe8920900ce054 (diff)
downloadtor-231036a110c1062e39b214b4b88fdc2a1eb46dc8.tar.gz
tor-231036a110c1062e39b214b4b88fdc2a1eb46dc8.zip
Merge branch 'maint-0.3.4' into maint-0.3.5
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 573fdf221a..975a198182 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2279,7 +2279,7 @@ is non-zero):
extra-info document. (Default: 0)
[[PaddingStatistics]] **PaddingStatistics** **0**|**1**::
- Relays only.
+ Relays and bridges only.
When this option is enabled, Tor collects statistics for padding cells
sent and received by this relay, in addition to total cell counts.
These statistics are rounded, and omitted if traffic is low. This