commit f25f7b759c0c3aa2ba333fcf2dd2ad89c5187eef Merge: 3681463 c14c662 Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 13 10:48:35 2016 -0400

Merge branch 'maint-0.2.4' into maint-0.2.5

changes/geoip-jun2016 | 4 + src/config/geoip | 3349 +++++++++++++++++++++++++++++++++++-------------- src/config/geoip6 | 1366 ++++++++++++++++---- 3 files changed, 3527 insertions(+), 1192 deletions(-)