Merge branch 'maint-0.2.6' into release-0.2.6

This commit is contained in:
Nick Mathewson 2017-03-08 10:10:55 -05:00
commit 73371db4b9
3 changed files with 5884 additions and 7989 deletions

4
changes/geoip-march2017 Normal file
View File

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

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff