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

[arma at torproject.org]

commit 9bfb8af265ce6423107e7991228b84af96b7af7b
Merge: ff03347 a1074c7
Author: Roger Dingledine <arma at torproject.org>
Date:   Thu Jan 5 06:55:34 2012 -0500

    Merge branch 'maint-0.2.2'

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