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

commit 84bc75b2e7046eed519e09cba77b3a1727fa64f5 Merge: 4ceae7c6b 04a8e81fa Author: Nick Mathewson <nickm@torproject.org> Date: Thu Feb 8 10:29:06 2018 -0500 Merge branch 'maint-0.3.1' into 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(-)