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

This commit is contained in:
Nick Mathewson 2012-04-11 09:26:37 -04:00
commit 5465ac5ea3
2 changed files with 6373 additions and 3183 deletions

3
changes/geoip-april2012 Normal file
View File

@ -0,0 +1,3 @@
o Minor features:
- Update to the April 3 2012 Maxmind GeoLite Country database.

File diff suppressed because it is too large Load Diff