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

[nickm at torproject.org]

commit abd6205384694f2e2647db0742fed7f1447ce4b5
Merge: 6f238a44d 04a8e81fa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 8 10:29:06 2018 -0500

    Merge branch 'maint-0.3.1' into release-0.3.1

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