commit 028cac97c1953f666c89711e31754cec4273b2d0 Merge: 63a90f2 0ac7483 Author: Nick Mathewson nickm@torproject.org Date: Mon Apr 27 14:18:31 2015 -0400

Merge remote-tracking branch 'origin/maint-0.2.6'

changes/geoip-april2015 | 3 + changes/geoip6-april2015 | 2 + src/config/geoip |10061 ++++++++++++++++------------------------------ src/config/geoip6 | 1268 ++++-- 4 files changed, 4465 insertions(+), 6869 deletions(-)