commit 630337e7626d19f33eba6436dbd0aae1fee94f1e Merge: 06b10cc 0582746 Author: Roger Dingledine arma@torproject.org Date: Thu Dec 8 04:40:30 2011 -0500

Merge branch 'maint-0.2.2'

changes/geoip-december2011 | 3 + src/config/geoip |10429 ++++++++++++++++++++++++++++---------------- 2 files changed, 6660 insertions(+), 3772 deletions(-)