diff options
| author | teor <teor@torproject.org> | 2019-06-24 19:47:34 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-06-24 19:47:34 +1000 |
| commit | 872b85e689f978de79149c6f44ce4f0a76c6618a (patch) | |
| tree | 97cf2a9a557c96970b2d2b32082f9ec99453e767 /doc | |
| parent | 70415c9f729847a56e7feefe75e77b2cb96d4667 (diff) | |
| parent | 8356cc5b514a5d6a0170927d7c3730e2e1164298 (diff) | |
| download | tor-872b85e689f978de79149c6f44ce4f0a76c6618a.tar.gz tor-872b85e689f978de79149c6f44ce4f0a76c6618a.zip | |
Merge branch 'bug30956_041' into bug30956_master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 064259b15f..e992f883f0 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2451,8 +2451,10 @@ 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. + Disabling this option also removes bandwidth usage statistics, and + GeoIPFile and GeoIPv6File hashes from the extra-info file. Bridge + ServerTransportPlugin lines are always includes in the extra-info file, + because they are required by BridgeDB. (Default: 1) [[ExtendAllowPrivateAddresses]] **ExtendAllowPrivateAddresses** **0**|**1**:: |