瀏覽代碼

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

Nick Mathewson 9 年之前
父節點
當前提交
0ac748353a
共有 4 個文件被更改,包括 555 次插入1083 次删除
  1. 3 0
      changes/geoip-april2015
  2. 2 0
      changes/geoip6-april2015
  3. 203 939
      src/config/geoip
  4. 347 144
      src/config/geoip6

+ 3 - 0
changes/geoip-april2015

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

+ 2 - 0
changes/geoip6-april2015

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

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


File diff suppressed because it is too large
+ 347 - 144
src/config/geoip6


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