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

[nickm at torproject.org]

commit a1ce1ab201e4ca46cd3caa3fc3c9bd692d2de3b1
Merge: 48d94e290 8042c356f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 8 09:34:57 2018 -0500

    Merge branch 'maint-0.3.0' into maint-0.3.1

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