commit ace95c525c55387d4f219043400c9821e41994bc Merge: 2c877d2 b46353b Author: Nick Mathewson nickm@torproject.org Date: Mon Sep 16 12:47:05 2013 -0400

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

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