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

[nickm at torproject.org]

commit 0d63a60643f16974e857a16e5f6e36663d3caca3
Merge: b2c220a62 3418a3a7f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 13 10:58:02 2018 -0400

    Merge branch 'maint-0.2.5' into release-0.2.5

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