Merge remote-tracking branch 'origin/maint-0.2.4' into release-0.2.5

This commit is contained in:
Nick Mathewson
2015-04-27 14:16:15 -04:00
4 changed files with 4465 additions and 6869 deletions
+3
View File
@@ -0,0 +1,3 @@
o Minor features:
- Update geoip to the April 8 2015 Maxmind GeoLite2 Country database.
+2
View File
@@ -0,0 +1,2 @@
o Minor features:
- Update geoip6 to the April 8 2015 Maxmind GeoLite2 Country database.