diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-08-13 12:52:57 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-08-13 12:52:57 -0400 |
| commit | 938deecc876e110d708edda544d20d9fd752838e (patch) | |
| tree | 9069aad92da78b718226abbea4e649c363885191 /doc | |
| parent | bb68c731b897a967a4b7eb138728fa077617646e (diff) | |
| parent | fa7ce6d3be62061de73176ffb939aa8d353d4014 (diff) | |
| download | tor-938deecc876e110d708edda544d20d9fd752838e.tar.gz tor-938deecc876e110d708edda544d20d9fd752838e.zip | |
Merge remote-tracking branch 'origin/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 7b1d7d9bb2..5a16a70b2c 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1698,7 +1698,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) |