diff options
| author | teor <teor@torproject.org> | 2020-03-19 17:02:02 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2020-03-19 17:02:02 +1000 |
| commit | fe5ecaa270b037e76226bd7acda10a14611eef93 (patch) | |
| tree | 1372685963a32b2a7f94e87c40ce9cea230e1674 /doc | |
| parent | 78b2984ac99ead6f87504cda9b4f61d5641cb533 (diff) | |
| parent | 259fad5877ae4aefea7996eac4cac436d28e2ee6 (diff) | |
| download | tor-fe5ecaa270b037e76226bd7acda10a14611eef93.tar.gz tor-fe5ecaa270b037e76226bd7acda10a14611eef93.zip | |
Merge branch 'maint-0.4.3'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index dfc7aa9d4c..e1bd8cb60b 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2656,7 +2656,7 @@ types of statistics that Tor relays collect and publish: its extra-info documents that it uploads to the directory authorities. 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, + ServerTransportPlugin lines are always included in the extra-info file, because they are required by BridgeDB. (Default: 1) |