commit cce76fbbe2f37fca5941ad0ad93b3f1814a1c8c2 Merge: 211fe44e0 84bc75b2e Author: Nick Mathewson nickm@torproject.org Date: Thu Feb 8 10:29:06 2018 -0500

Merge branch 'maint-0.3.2'

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