Commit 6c7720ed authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

parents 3a5d4d66 efae1bce
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
  o Minor features:
    - Update geoip to the April 8 2015 Maxmind GeoLite2 Country database.
+2 −0
Original line number Diff line number Diff line
  o Minor features:
    - Update geoip6 to the April 8 2015 Maxmind GeoLite2 Country database.
+3449 −6612

File changed.

File size exceeds preview limit.