Commit 159ddf6d authored by Nick Mathewson's avatar Nick Mathewson

Merge branch 'maint-0.2.5' into maint-0.2.6

parents 21d77673 68d67204
o Minor features:
- Update geoip and geoip6 to the May 2 2017 Maxmind GeoLite2
Country database.
This diff is collapsed.
This diff is collapsed.
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