commit b46353b7931235da3ecaec0723060501042d6ef4 Merge: 3cebc5e 13d192c Author: Nick Mathewson nickm@torproject.org Date: Mon Sep 16 12:46:50 2013 -0400

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

changes/geoip-september2013 | 3 + src/config/geoip |12806 ++++++++++++++++++++++--------------------- 2 files changed, 6556 insertions(+), 6253 deletions(-)