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

[nickm at torproject.org]

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

    Merge branch 'maint-0.2.5' into maint-0.2.9

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