Merge branch 'maint-0.2.5' into maint-0.2.6

This commit is contained in:
Nick Mathewson
2016-04-07 10:45:38 -04:00
3 changed files with 4455 additions and 1353 deletions
+4
View File
@@ -0,0 +1,4 @@
o Minor features:
- Update geoip and geoip6 to the April 5 2016 Maxmind GeoLite2
Country database.
+2410 -845
View File
File diff suppressed because it is too large Load Diff
+2041 -508
View File
File diff suppressed because it is too large Load Diff