Merge branch 'maint-0.2.6' into maint-0.2.7

This commit is contained in:
Nick Mathewson 2016-03-09 10:36:50 -05:00
commit 17cfdb358c
3 changed files with 6524 additions and 4246 deletions

4
changes/geoip-march2016 Normal file
View File

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