Bladeren bron

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

Nick Mathewson 9 jaren geleden
bovenliggende
commit
7c9be64e1a
4 gewijzigde bestanden met toevoegingen van 1332 en 234 verwijderingen
  1. 3 0
      changes/geoip-march2015
  2. 3 0
      changes/geoip6-march2015
  3. 971 119
      src/config/geoip
  4. 355 115
      src/config/geoip6

+ 3 - 0
changes/geoip-march2015

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

+ 3 - 0
changes/geoip6-march2015

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

File diff suppressed because it is too large
+ 971 - 119
src/config/geoip


File diff suppressed because it is too large
+ 355 - 115
src/config/geoip6


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