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

[nickm at torproject.org]

commit 942fa0c4a21c9e2cf3b75b0d014f386a7615d983
Merge: 44aa1adf3 748ad2124
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 8 09:35:55 2018 -0500

    Merge branch '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(-)