Merge branch 'maint-0.2.4' into release-0.2.4

This commit is contained in:
Roger Dingledine 2013-03-11 14:02:26 -04:00
commit 790ddd6e0a
2 changed files with 85446 additions and 7432 deletions

3
changes/geoip-mar2013 Normal file
View File

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

File diff suppressed because it is too large Load Diff