Commit 54771bca authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge branch 'maint-0.2.5' into maint-0.2.6

parents b6227eda 34fdd510
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
  o Minor features:
    - Update geoip and geoip6 to the January 4 2017 Maxmind GeoLite2
      Country database.
+2054 −1106

File changed.

Preview size limit exceeded, changes collapsed.

+494 −67

File changed.

Preview size limit exceeded, changes collapsed.