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

This commit is contained in:
Nick Mathewson 2015-06-25 11:46:16 -04:00
commit 80fb1ef8ba
4 changed files with 8560 additions and 8075 deletions

3
changes/geoip-june2015 Normal file
View File

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

3
changes/geoip6-june2015 Normal file
View File

@ -0,0 +1,3 @@
o Minor features:
- Update geoip6 to the June 3 2015 Maxmind GeoLite2 Country database.

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff