Browse Source

Merge branch 'maint-0.2.1' into maint-0.2.2

Roger Dingledine 14 years ago
parent
commit
56180d169a
2 changed files with 294 additions and 295 deletions
  1. 3 0
      changes/geoip-october2011
  2. 291 295
      src/config/geoip

+ 3 - 0
changes/geoip-october2011

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

File diff suppressed because it is too large
+ 291 - 295
src/config/geoip


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