Merge branch 'maint-0.2.2'

This commit is contained in:
Roger Dingledine 2011-06-05 11:14:28 -04:00
commit 96da10aace
2 changed files with 3789 additions and 1612 deletions

3
changes/geoip-june2011 Normal file
View File

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

File diff suppressed because it is too large Load Diff