Merge remote-tracking branch 'origin/maint-0.2.5'

This commit is contained in:
Nick Mathewson 2014-07-21 14:30:27 -04:00
commit 641c1584f7
4 changed files with 3439 additions and 3840 deletions

3
changes/geoip-july2014 Normal file
View File

@ -0,0 +1,3 @@
o Minor features:
- Update geoip to the July 10 2014 Maxmind GeoLite2 Country database.

2
changes/geoip6-july2014 Normal file
View File

@ -0,0 +1,2 @@
o Minor features:
- Update geoip6 to the July 10 2014 Maxmind GeoLite2 Country database.

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff