Merge branch 'maint-0.2.5' into maint-0.2.6

This commit is contained in:
Nick Mathewson 2017-05-08 08:07:04 -04:00
commit 159ddf6dde
3 changed files with 4358 additions and 2197 deletions

4
changes/geoip-may2017 Normal file
View File

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