Browse Source

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

Nick Mathewson 9 years ago
parent
commit
fa7ce6d3be
5 changed files with 609 additions and 1387 deletions
  1. 3 0
      changes/geoip-august2014
  2. 3 0
      changes/geoip6-august2014
  3. 1 1
      doc/tor.1.txt
  4. 324 126
      src/config/geoip
  5. 278 1260
      src/config/geoip6

+ 3 - 0
changes/geoip-august2014

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

+ 3 - 0
changes/geoip6-august2014

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

+ 1 - 1
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)
 

File diff suppressed because it is too large
+ 324 - 126
src/config/geoip


File diff suppressed because it is too large
+ 278 - 1260
src/config/geoip6


Some files were not shown because too many files changed in this diff