Merge branch 'maint-0.2.6' into maint-0.2.7

This commit is contained in:
Nick Mathewson 2016-05-09 14:56:56 -04:00
commit 7fe80c2905
3 changed files with 4631 additions and 3268 deletions

4
changes/geoip-may2016 Normal file
View File

@ -0,0 +1,4 @@
o Minor features:
- Update geoip and geoip6 to the May 4 2016 Maxmind GeoLite2
Country database.

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff