瀏覽代碼

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

Nick Mathewson 11 年之前
父節點
當前提交
52bf1556b1
共有 3 個文件被更改,包括 796 次插入138 次删除
  1. 3 0
      changes/geoip-dec2012
  2. 3 0
      changes/geoip-nov2012
  3. 790 138
      src/config/geoip

+ 3 - 0
changes/geoip-dec2012

@@ -0,0 +1,3 @@
+  o Minor features:
+    - Update to the December 5 2012 Maxmind GeoLite Country database.
+

+ 3 - 0
changes/geoip-nov2012

@@ -0,0 +1,3 @@
+  o Minor features:
+    - Update to the November 7 2012 Maxmind GeoLite Country database.
+

File diff suppressed because it is too large
+ 790 - 138
src/config/geoip


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