commit 78735f87785a460e587e2fc879604a7603d4b0e5 Merge: 96d3219 f805317 Author: Nick Mathewson nickm@torproject.org Date: Mon May 20 12:34:59 2013 -0400

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

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