Commit 83e3975c authored by Roger Dingledine's avatar Roger Dingledine
Browse files

Merge branch 'maint-0.2.1' into maint-0.2.2

parents 7aa20b20 bf4b819a
o Minor features:
- Update to the June 1 2011 Maxmind GeoLite Country database.
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment