Commit 089ee135 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge branch 'maint-0.2.5' into maint-0.2.6

parents 2ec5e24c e8e89fd7
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
  o Minor features:
    - Update geoip and geoip6 to the December 1 2015 Maxmind GeoLite2
      Country database.
+3324 −1223

File changed.

Preview size limit exceeded, changes collapsed.

+2184 −396

File changed.

Preview size limit exceeded, changes collapsed.