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

This commit is contained in:
Nick Mathewson 2015-03-09 16:25:41 -04:00
commit 59f4c41087
4 changed files with 10398 additions and 3531 deletions

3
changes/geoip-march2015 Normal file
View File

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

3
changes/geoip6-march2015 Normal file
View File

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