Merge branch 'maint-0.2.5' into maint-0.2.6

This commit is contained in:
Nick Mathewson
2017-08-01 11:19:29 -04:00
3 changed files with 7530 additions and 3243 deletions
+4
View File
@@ -0,0 +1,4 @@
o Minor features:
- Update geoip and geoip6 to the July 4 2017 Maxmind GeoLite2
Country database.