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

[arma@xxxxxxxxxxxxxx]

commit 4b6b398cff0c077fc09c19d719971ca58ae1329d
Merge: 3bcba6d 54ccc80
Author: Roger Dingledine <arma@xxxxxxxxxxxxxx>
Date:   Mon Feb 7 22:21:01 2011 -0500

    Merge branch 'maint-0.2.2'

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