Merge branch 'maint-0.2.2'

This commit is contained in:
Roger Dingledine 2012-06-13 03:48:43 -04:00
commit 068046eebc
2 changed files with 13355 additions and 22128 deletions

3
changes/geoip-june2012 Normal file
View File

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

File diff suppressed because it is too large Load Diff