commit 6c7720ed49623f649aa6280606c129ee153b04ed Merge: 3a5d4d6 efae1bc Author: Nick Mathewson nickm@torproject.org Date: Mon Apr 27 14:16:55 2015 -0400

Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

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