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
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
  o Minor features:
    - Update to the January 3 2012 Maxmind GeoLite Country database.