Commit 5b55778c 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 0872d8e3 137982f9

changes/geoip-november2014

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor features:

    - Update geoip to the November 15 2014 Maxmind GeoLite2 Country database.

changes/geoip6-november2014

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor features:

    - Update geoip6 to the November 15 2014 Maxmind GeoLite2 Country database.

src/config/geoip

+13641 −6395

File changed.

Preview size limit exceeded, changes collapsed.

src/config/geoip6

+5506 −143

File changed.

Preview size limit exceeded, changes collapsed.