commit 0c2fb64d6fc7a3b6a3d3d7febb72e72299bca03d Merge: bc56918 78735f8 Author: Nick Mathewson nickm@torproject.org Date: Mon May 20 12:37:21 2013 -0400

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

changes/geoip-may2013 | 3 + src/config/geoip |20373 +++++++++++++++++++++++++------------------------ 2 files changed, 10221 insertions(+), 10155 deletions(-)