Merge branch 'maint-0.2.2' into release-0.2.2

This commit is contained in:
Roger Dingledine 2011-07-07 13:29:19 -04:00
commit 4cdf6ac336
2 changed files with 3963 additions and 2385 deletions

3
changes/geoip-july2011 Normal file
View File

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

File diff suppressed because it is too large Load Diff