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

[nickm at torproject.org]

commit e212c752f26a3c387ccda6beb2cb6c264a0ba98d
Merge: eb0c7ab43 8efbeb098
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 8 09:34:56 2018 -0500

    Merge branch 'maint-0.2.5' into release-0.2.5

 changes/geoip-2018-01-05 |     4 +
 src/config/geoip         | 31441 ++++++++++-----------------------------------
 src/config/geoip6        |   753 +-
 3 files changed, 7587 insertions(+), 24611 deletions(-)