commit 57ed8fbbdd6cdbca240f458fca391ba6363c7797 Merge: b5a8c3a 9d5d3a7 Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 8 10:50:33 2012 -0500

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

changes/geoip-march2012 | 3 + src/config/geoip |26743 +++++++++++++++++++++++++++++++++++------------ 2 files changed, 19971 insertions(+), 6775 deletions(-)