Browse Source

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

Nick Mathewson 9 years ago
parent
commit
b4ead16d57
4 changed files with 3297 additions and 240 deletions
  1. 3 0
      changes/geoip-november2014
  2. 3 0
      changes/geoip6-november2014
  3. 1114 234
      src/config/geoip
  4. 2177 6
      src/config/geoip6

+ 3 - 0
changes/geoip-november2014

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

+ 3 - 0
changes/geoip6-november2014

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

File diff suppressed because it is too large
+ 1114 - 234
src/config/geoip


File diff suppressed because it is too large
+ 2177 - 6
src/config/geoip6


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