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

[nickm at torproject.org]

commit 748ad2124db0b19861300d984a350519cc0a8bb1
Merge: 5f2c7a856 a1ce1ab20
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 8 09:35:55 2018 -0500

    Merge branch 'maint-0.3.1' into maint-0.3.2

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