Merge remote-tracking branch 'origin/maint-0.2.6'

This commit is contained in:
Nick Mathewson
2015-07-29 10:48:29 -04:00
3 changed files with 2387 additions and 996 deletions
+3
View File
@@ -0,0 +1,3 @@
o Minor features:
- Update geoip and geoip6 to the July 8 2015 Maxmind GeoLite2 Country database.