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

[arma at torproject.org]

commit a1074c7aa2afab595d434c52754ee47cec404189
Merge: d861b4c df17b62
Author: Roger Dingledine <arma at torproject.org>
Date:   Thu Jan 5 06:45:28 2012 -0500

    Merge branch 'maint-0.2.1' into maint-0.2.2

 changes/geoip-january2012 |    3 +
 src/config/geoip          | 9630 ++++++++++++++++++++++++---------------------
 2 files changed, 5096 insertions(+), 4537 deletions(-)