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

This commit is contained in:
Nick Mathewson 2015-04-27 14:18:16 -04:00
commit 0ac748353a
4 changed files with 4465 additions and 6869 deletions

3
changes/geoip-april2015 Normal file
View File

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

2
changes/geoip6-april2015 Normal file
View File

@ -0,0 +1,2 @@
o Minor features:
- Update geoip6 to the April 8 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