summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2021-03-24 13:17:27 +0200
committerGeorge Kadianakis <desnacked@riseup.net>2021-03-24 13:17:27 +0200
commitf1c673fa545dc4fc9003b3fe2170d7fd42870a18 (patch)
treebf5560573cb95dd5f3926d5d78a38d74bacf178e
parent0cf3ab54f6701e37a28a3ad06d4dae1d7a031007 (diff)
parent3a2593710bac58a6789ac4dd6bef473802289a4d (diff)
downloadtor-f1c673fa545dc4fc9003b3fe2170d7fd42870a18.tar.gz
tor-f1c673fa545dc4fc9003b3fe2170d7fd42870a18.zip
Merge remote-tracking branch 'tor-gitlab/mr/343'
-rw-r--r--changes/ticket403464
-rw-r--r--doc/man/tor.1.txt2
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/ticket40346 b/changes/ticket40346
new file mode 100644
index 0000000000..c76e6d6aec
--- /dev/null
+++ b/changes/ticket40346
@@ -0,0 +1,4 @@
+ o Documentation (man, onion service):
+ - The HiddenServiceStatistics option also applies to bridges so properly
+ indicate that in the tor.1 man page. Closes ticket 40346.
+
diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt
index 20e3bc7c3a..8761237aff 100644
--- a/doc/man/tor.1.txt
+++ b/doc/man/tor.1.txt
@@ -2758,7 +2758,7 @@ types of statistics that Tor relays collect and publish:
(Default: 1)
[[HiddenServiceStatistics]] **HiddenServiceStatistics** **0**|**1**::
- Relays only.
+ Relays and bridges only.
When this option is enabled, a Tor relay writes obfuscated
statistics on its role as hidden-service directory, introduction
point, or rendezvous point to disk every 24 hours. If ExtraInfoStatistics