commit 0e790bb40df4c6bd86e1a97a7872f04d0d2a53e7 Merge: a499be33b 7e45720cf Author: Nick Mathewson nickm@torproject.org Date: Wed Dec 20 12:15:24 2017 -0500

Merge branch '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(-)