Bladeren bron

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

Nick Mathewson 9 jaren geleden
bovenliggende
commit
d8517fe843
4 gewijzigde bestanden met toevoegingen van 518 en 1153 verwijderingen
  1. 3 0
      changes/geoip-january2015
  2. 2 0
      changes/geoip6-january2015
  3. 144 1063
      src/config/geoip
  4. 369 90
      src/config/geoip6

+ 3 - 0
changes/geoip-january2015

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

+ 2 - 0
changes/geoip6-january2015

@@ -0,0 +1,2 @@
+  o Minor features:
+    - Update geoip6 to the January 7 2015 Maxmind GeoLite2 Country database.

File diff suppressed because it is too large
+ 144 - 1063
src/config/geoip


File diff suppressed because it is too large
+ 369 - 90
src/config/geoip6


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