[or-cvs] [tor/maint-0.2.2] Merge branch 'maint-0.2.1' into maint-0.2.2

[arma at torproject.org]

commit 54ccc80a4a740c175f279d00dc5441c673b0263c
Merge: fcf3eb0 9c2cb6f
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon Feb 7 22:20:35 2011 -0500

    Merge branch 'maint-0.2.1' into maint-0.2.2

 changes/geoip-feb2011 |    3 +
 src/config/geoip      | 5232 ++++++++++++++++++++++++++++++++-----------------
 2 files changed, 3413 insertions(+), 1822 deletions(-)