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

This commit is contained in:
Nick Mathewson 2015-01-23 08:52:55 -05:00
commit 7cbdec578b
4 changed files with 6073 additions and 8067 deletions

View File

@ -0,0 +1,3 @@
o Minor features:
- Update geoip to the January 7 2015 Maxmind GeoLite2 Country database.

View File

@ -0,0 +1,2 @@
o Minor features:
- Update geoip6 to the January 7 2015 Maxmind GeoLite2 Country database.

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff