[tor-commits] [tor/master] Merge branch 'maint-0.3.0'

commit 300f8e6f0a0b5ba190f2eba740d092c9fc358795 Merge: 9decf86 f587691 Author: Nick Mathewson <nickm@torproject.org> Date: Mon May 8 08:07:49 2017 -0400 Merge branch 'maint-0.3.0' changes/geoip-may2017 | 4 + src/config/geoip | 5862 +++++++++++++++++++++++++++++++------------------ src/config/geoip6 | 689 +++++- 3 files changed, 4358 insertions(+), 2197 deletions(-)