[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

[arma at torproject.org]

commit e569e6b201ddf43d2809a936edc76aaaa92693e4
Merge: 63651b9 6426cd1
Author: Roger Dingledine <arma at torproject.org>
Date:   Tue Mar 8 18:16:27 2011 -0500

    Merge branch 'maint-0.2.2'

 changes/geoip-mar2011 |    3 +
 src/config/geoip      | 7639 ++++++++++++++++++++++++++++---------------------
 2 files changed, 4420 insertions(+), 3222 deletions(-)