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

[nickm at torproject.org]

commit 0ddc2dc531778cfc89bad6e1c77c4eda1b8e0f71
Merge: a2aaf9509 f1278b7e5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 8 10:29:05 2018 -0500

    Merge branch 'maint-0.2.5' into maint-0.2.9

 changes/geoip-2018-02-07 |     4 +
 src/config/geoip         | 34364 ++++++++++++++++++++++++++++++++++++---------
 src/config/geoip6        |   841 +-
 3 files changed, 28369 insertions(+), 6840 deletions(-)