commit 0b9c515870f6444fb706590103618c9a2f67c47a Merge: 60d633c 2a61b0d Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 8 09:22:00 2013 -0400

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

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