commit 20634fac5475c840478755101f0e92659accfd6b Merge: f631b73 c78c8de Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 8 09:23:09 2013 -0400

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

changes/geoip-july2013 | 3 + src/config/geoip | 2201 +++++++++++++++++++++++++++++++----------------- 2 files changed, 1425 insertions(+), 779 deletions(-)