diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-08-13 12:52:40 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-08-13 12:52:40 -0400 |
| commit | fa7ce6d3be62061de73176ffb939aa8d353d4014 (patch) | |
| tree | 1b24dad14a48fa2b2eafe3c579028a46c4891cbe /doc | |
| parent | 4056c61608f1ede0da56559cb7e56ec2087dc659 (diff) | |
| parent | b45f0f8fb9b11effcd48159c078f09a3fbc04b11 (diff) | |
| download | tor-fa7ce6d3be62061de73176ffb939aa8d353d4014.tar.gz tor-fa7ce6d3be62061de73176ffb939aa8d353d4014.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
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 abe613e569..93d302eb9d 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1694,7 +1694,7 @@ is non-zero): [[BridgeRecordUsageByCountry]] **BridgeRecordUsageByCountry** **0**|**1**:: When this option is enabled and BridgeRelay is also enabled, and we have - GeoIP data, Tor keeps a keep a per-country count of how many client + 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) |