commit c2b64ad0968f040e2b5ecb426d3520a02acb5cc7 Merge: 748f0abc2 7e45720cf Author: Nick Mathewson nickm@torproject.org Date: Wed Dec 20 12:15:24 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

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