summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2019-03-26 15:34:54 +0200
committerGeorge Kadianakis <desnacked@riseup.net>2019-03-26 15:34:54 +0200
commitd11976b8bd4bded2939ff973d7b2beb36c201bf0 (patch)
treea0fd4b5df11eba889d7fa393b2b32aea57984331 /doc
parent2790ee3685ac2d906cab99d1eac8f7a627b00d90 (diff)
parent6c652eae0a95cae095f5adad9cc51e1f1a183245 (diff)
downloadtor-d11976b8bd4bded2939ff973d7b2beb36c201bf0.tar.gz
tor-d11976b8bd4bded2939ff973d7b2beb36c201bf0.zip
Merge branch 'tor-github/pr/709'
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index ee91976066..ac79ed231b 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -2313,7 +2313,8 @@ is non-zero):
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. (Default: 1)
+ which countries have blocked access to it. If ExtraInfoStatistics is
+ enabled, it will be published as part of extra-info document. (Default: 1)
[[ServerDNSRandomizeCase]] **ServerDNSRandomizeCase** **0**|**1**::
When this option is set, Tor sets the case of each character randomly in
@@ -2395,6 +2396,8 @@ is non-zero):
[[ExtraInfoStatistics]] **ExtraInfoStatistics** **0**|**1**::
When this option is enabled, Tor includes previously gathered statistics in
its extra-info documents that it uploads to the directory authorities.
+ Disabling this option also disables bandwidth usage statistics, GeoIPFile
+ hashes, and ServerTransportPlugin lists in the extra-info file.
(Default: 1)
[[ExtendAllowPrivateAddresses]] **ExtendAllowPrivateAddresses** **0**|**1**::