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

[nickm at torproject.org]

commit f3ea412110dea8f621c0b67706ba024a023c76a6
Merge: 7c411bba8 8042c356f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 8 09:34:56 2018 -0500

    Merge branch 'maint-0.3.0' into release-0.3.0

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