Merge branch 'maint-0.2.1' into maint-0.2.2

This commit is contained in:
Roger Dingledine 2011-05-10 23:05:51 -04:00
commit 7206d784dc
2 changed files with 4392 additions and 2090 deletions

3
changes/geoip-may2011 Normal file
View File

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

File diff suppressed because it is too large Load Diff