Commit 36814637 authored by Nick Mathewson's avatar Nick Mathewson 🏃
Browse files

Merge branch 'maint-0.2.4' into maint-0.2.5

parents 34a51d16 3c2d4611
o Minor features:
- Update geoip and geoip6 to the May 4 2016 Maxmind GeoLite2
Country database.
This diff is collapsed.
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