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

[nickm at torproject.org]

commit 279fa65d34bbb41d1428eb62f6172b218598644e
Merge: 1d281eb93 1fa396b0a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 5 08:22:33 2018 -0400

    Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-2018-04-03 |     4 +
 src/config/geoip         | 39253 ++++++++++++++++++++++++++++++++++-----------
 src/config/geoip6        |  5391 +++----
 3 files changed, 31480 insertions(+), 13168 deletions(-)