commit 82d8944928daf868d12797e59a3a58ce4cb4f205 Merge: 004a9c6 3b02651 Author: Nick Mathewson nickm@torproject.org Date: Fri Oct 11 11:16:45 2013 -0400

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

changes/geoip-october2013 | 3 + src/config/geoip | 2019 ++++++++++++++++++++++++++++----------------- 2 files changed, 1245 insertions(+), 777 deletions(-)