Merge branch 'maint-0.2.5' into maint-0.2.6

This commit is contained in:
Nick Mathewson
2016-05-09 14:55:45 -04:00
3 changed files with 4631 additions and 3268 deletions
+4
View File
@@ -0,0 +1,4 @@
o Minor features:
- Update geoip and geoip6 to the May 4 2016 Maxmind GeoLite2
Country database.
+4011 -2980
View File
File diff suppressed because it is too large Load Diff
+616 -288
View File
File diff suppressed because it is too large Load Diff