Browse Source

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

Nick Mathewson 10 years ago
parent
commit
e0aa88d106
4 changed files with 407 additions and 1805 deletions
  1. 3 0
      changes/geoip-july2014
  2. 2 0
      changes/geoip6-july2014
  3. 358 147
      src/config/geoip
  4. 44 1658
      src/config/geoip6

+ 3 - 0
changes/geoip-july2014

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

+ 2 - 0
changes/geoip6-july2014

@@ -0,0 +1,2 @@
+  o Minor features:
+    - Update geoip6 to the July 10 2014 Maxmind GeoLite2 Country database.

File diff suppressed because it is too large
+ 358 - 147
src/config/geoip


File diff suppressed because it is too large
+ 44 - 1658
src/config/geoip6


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