瀏覽代碼

Merge branch 'maint-0.2.9' into maint-0.3.1

Nick Mathewson 6 年之前
父節點
當前提交
19f3868523
共有 3 個文件被更改,包括 499 次插入253 次删除
  1. 4 0
      changes/geoip-2018-06-07
  2. 208 205
      src/config/geoip
  3. 287 48
      src/config/geoip6

+ 4 - 0
changes/geoip-2018-06-07

@@ -0,0 +1,4 @@
+  o Minor features (geoip):
+    - Update geoip and geoip6 to the June 7 2018 Maxmind GeoLite2
+      Country database. Closes ticket 26351.
+

File diff suppressed because it is too large
+ 208 - 205
src/config/geoip


File diff suppressed because it is too large
+ 287 - 48
src/config/geoip6


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