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

[nickm at torproject.org]

commit efba81e3bb53ede274cbb139a15f318aab681d42
Merge: 0d172c118 748ad2124
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 8 09:35:55 2018 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

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