Merge branch 'maint-0.2.4' into maint-0.2.5

This commit is contained in:
Nick Mathewson 2016-06-13 10:48:35 -04:00
commit f25f7b759c
3 changed files with 3527 additions and 1192 deletions

4
changes/geoip-jun2016 Normal file
View File

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