commit 0b477bfd55b16d04ddd97cec09ec978e2a57ba3b Merge: 2ce99b9 3681463 Author: Nick Mathewson nickm@torproject.org Date: Mon May 9 14:55:45 2016 -0400

Merge branch 'maint-0.2.5' into maint-0.2.6

changes/geoip-may2016 | 4 + src/config/geoip | 6991 ++++++++++++++++++++++++++++--------------------- src/config/geoip6 | 904 +++++-- 3 files changed, 4631 insertions(+), 3268 deletions(-)