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

[arma at torproject.org]

commit a70ff4b2cba8a46a402b5add5cee31ce5f8a0836
Merge: 85c5390 4180624
Author: Roger Dingledine <arma at torproject.org>
Date:   Thu Feb 9 04:21:08 2012 -0500

    Merge branch 'maint-0.2.1' into maint-0.2.2

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