Merge branch 'maint-0.2.1' into maint-0.2.2

This commit is contained in:
Roger Dingledine 2011-02-07 22:20:35 -05:00
commit 54ccc80a4a
2 changed files with 3413 additions and 1822 deletions

3
changes/geoip-feb2011 Normal file
View File

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

File diff suppressed because it is too large Load Diff