Merge branch 'maint-0.2.5' into maint-0.2.6

This commit is contained in:
Nick Mathewson
2016-09-07 13:53:53 -04:00
3 changed files with 10566 additions and 22657 deletions
+4
View File
@@ -0,0 +1,4 @@
o Minor features:
- Update geoip and geoip6 to the September 6 2016 Maxmind GeoLite2
Country database.
+9149 -21697
View File
File diff suppressed because it is too large Load Diff
+1413 -960
View File
File diff suppressed because it is too large Load Diff