Commit d920cbb8 authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge branch 'maint-0.2.6' into maint-0.2.7

parents 7d1fe7c9 44ad3be2
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
  o Minor features:
    - Update geoip and geoip6 to the February 2 2016 Maxmind GeoLite2
      Country database.
+1637 −507

File changed.

Preview size limit exceeded, changes collapsed.

+687 −177

File changed.

Preview size limit exceeded, changes collapsed.