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

commit 7e45720cf4c88bff92a6de23ccbdd96d4cab2be5 Merge: 565ec6100 5e9264671 Author: Nick Mathewson nickm@torproject.org Date: Wed Dec 20 12:15:24 2017 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2

changes/geoip-2017-12-06 | 4 + src/config/geoip | 12380 +++++++++++++++++++++++++++------------------ src/config/geoip6 | 3373 +++++++++--- 3 files changed, 10033 insertions(+), 5724 deletions(-)