Browse Source

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

Nick Mathewson 11 years ago
parent
commit
c64b549621
4 changed files with 943 additions and 292 deletions
  1. 3 0
      changes/geoip-february2014
  2. 3 0
      changes/geoip6-february2014
  3. 346 228
      src/config/geoip
  4. 591 64
      src/config/geoip6

+ 3 - 0
changes/geoip-february2014

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

+ 3 - 0
changes/geoip6-february2014

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

File diff suppressed because it is too large
+ 346 - 228
src/config/geoip


File diff suppressed because it is too large
+ 591 - 64
src/config/geoip6


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