commit ef0bc7f8f26a917c89ca947a2b432b57cd5e06b5 Merge: 6c3cffe a70ff4b Author: Roger Dingledine arma@torproject.org Date: Thu Feb 9 04:21:20 2012 -0500

Merge branch 'maint-0.2.2'

changes/geoip-february2012 | 3 + src/config/geoip |12782 +++++++++++++++++++++++++------------------- 2 files changed, 7193 insertions(+), 5592 deletions(-)