nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

Browse Source
This commit is contained in:
Nick Mathewson 2014-08-13 12:52:40 -04:00
commit fa7ce6d3be
5 changed files with 4518 additions and 2719 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/geoip-august2014 Normal file
View File

@ -0,0 +1,3 @@
o Minor features:
- Update geoip to the August 7 2014 Maxmind GeoLite2 Country database.

3
changes/geoip6-august2014 Normal file
View File

@ -0,0 +1,3 @@
o Minor features:
- Update geoip6 to the August 7 2014 Maxmind GeoLite2 Country database.

2
doc/tor.1.txt
View File

@ -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)

5217
src/config/geoip
View File

File diff suppressed because it is too large Load Diff

2012
src/config/geoip6
View File

File diff suppressed because it is too large Load Diff