Browse Source

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

Nick Mathewson 9 years ago
parent
commit
80fb1ef8ba
4 changed files with 790 additions and 550 deletions
  1. 3 0
      changes/geoip-june2015
  2. 3 0
      changes/geoip6-june2015
  3. 352 248
      src/config/geoip
  4. 432 302
      src/config/geoip6

+ 3 - 0
changes/geoip-june2015

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

+ 3 - 0
changes/geoip6-june2015

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

File diff suppressed because it is too large
+ 352 - 248
src/config/geoip


File diff suppressed because it is too large
+ 432 - 302
src/config/geoip6


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