Commit 7da1ae7a authored by Roger Dingledine's avatar Roger Dingledine
Browse files

Merge branch 'maint-0.2.1' into release-0.2.1

parents 0b74f642 df17b62d
o Minor features:
- Update to the January 3 2012 Maxmind GeoLite Country database.
Markdown is supported
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