commit 67127dca57fe63a9ded02db1e63dfbe166ca36d0 Merge: f5e37b2eb 84bc75b2e Author: Nick Mathewson nickm@torproject.org Date: Thu Feb 8 10:29:06 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

changes/geoip-2018-02-07 | 4 + src/config/geoip | 34364 ++++++++++++++++++++++++++++++++++++--------- src/config/geoip6 | 841 +- 3 files changed, 28369 insertions(+), 6840 deletions(-)