瀏覽代碼

Merge branch 'maint-0.3.2' into maint-0.3.3

Nick Mathewson 6 年之前
父節點
當前提交
78bf564168
共有 3 個文件被更改,包括 750 次插入1147 次删除
  1. 4 0
      changes/geoip-2018-04-03
  2. 574 312
      src/config/geoip
  3. 172 835
      src/config/geoip6

+ 4 - 0
changes/geoip-2018-04-03

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

File diff suppressed because it is too large
+ 574 - 312
src/config/geoip


File diff suppressed because it is too large
+ 172 - 835
src/config/geoip6


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