[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.5' into maint-0.2.9

[nickm at torproject.org]

commit 67a313f0ecc281dd73004eaa810b17e3cdcc3a24
Merge: 9eb6f9d3c 3418a3a7f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 13 10:58:02 2018 -0400

    Merge branch 'maint-0.2.5' into maint-0.2.9

 changes/geoip-2018-03-08 |     4 +
 src/config/geoip         | 36382 ++++++++++++---------------------------------
 src/config/geoip6        |   662 +-
 3 files changed, 9970 insertions(+), 27078 deletions(-)