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

commit cdc960b538d677c5434a91eec7b25a93c93df0fa Merge: d92e622 5207e41 Author: Nick Mathewson <nickm@torproject.org> Date: Mon May 8 08:07:56 2017 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/geoip-may2017 | 4 + src/config/geoip | 5862 +++++++++++++++++++++++++++++++------------------ src/config/geoip6 | 689 +++++- 3 files changed, 4358 insertions(+), 2197 deletions(-)