Browse Source

Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3

Nick Mathewson 10 years ago
parent
commit
82d8944928
2 changed files with 284 additions and 203 deletions
  1. 3 0
      changes/geoip-october2013
  2. 281 203
      src/config/geoip

+ 3 - 0
changes/geoip-october2013

@@ -0,0 +1,3 @@
+  o Minor features:
+    - Update to the October 2 2013 Maxmind GeoLite Country database.
+

File diff suppressed because it is too large
+ 281 - 203
src/config/geoip


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