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

commit e1e914cd4bcc2409ea32bac7b8c43710eb62ce9b Merge: 14ec62f06 74ac463e7 Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 12 08:11:20 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

changes/geoip-2018-06-07 | 4 + src/config/geoip | 5848 +++++++++++++++++++++++++++++----------------- src/config/geoip6 | 810 ++++++- 3 files changed, 4354 insertions(+), 2308 deletions(-)