commit 5c7f9844e4f448d3d015fcdaaf685666e37da1cb
parent 0229d5f81862e8ef6765c6e1e7e6cd78a5a2b4cc
Author: Nick Mathewson <nickm@torproject.org>
Date: Mon, 22 Mar 2021 14:09:22 -0400
manpage:Move BridgeRecordUsageByCountry to statistics section
patch from cypherpunks; closes #40323
Diffstat:
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/changes/ticket40323 b/changes/ticket40323
@@ -0,0 +1,2 @@
+ o Documentation (manual):
+ - Move the description of "BridgeRecordUsageByCountry" to the section "STATISTICS OPTIONS". Closes ticket 40323.
diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt
@@ -2221,15 +2221,6 @@ is non-zero):
relay is configured in bridge mode.
//Out of order because it logically belongs after BridgeRelay.
-[[BridgeRecordUsageByCountry]] **BridgeRecordUsageByCountry** **0**|**1**::
- When this option is enabled and BridgeRelay is also enabled, and we have
- GeoIP data, Tor keeps a per-country count of how many client
- addresses have contacted it so that it can help the bridge authority guess
- which countries have blocked access to it. If ExtraInfoStatistics is
- enabled, it will be published as part of the extra-info document.
- (Default: 1)
-
-//Out of order because it logically belongs after BridgeRelay.
[[BridgeDistribution]] **BridgeDistribution** __string__::
If set along with BridgeRelay, Tor will include a new line in its
bridge descriptor which indicates to the BridgeDB service how it
@@ -2702,6 +2693,14 @@ Relays publish most statistics in a document called the
extra-info document. The following options affect the different
types of statistics that Tor relays collect and publish:
+[[BridgeRecordUsageByCountry]] **BridgeRecordUsageByCountry** **0**|**1**::
+ When this option is enabled and BridgeRelay is also enabled, and we have
+ GeoIP data, Tor keeps a per-country count of how many client
+ addresses have contacted it so that it can help the bridge authority guess
+ which countries have blocked access to it. If ExtraInfoStatistics is
+ enabled, it will be published as part of the extra-info document.
+ (Default: 1)
+
[[CellStatistics]] **CellStatistics** **0**|**1**::
Relays only.
When this option is enabled, Tor collects statistics about cell
