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

[arma at torproject.org]

commit 56180d169acb12302c65c1b5843f829cdb3aede2
Merge: 9648f03 ee545cd
Author: Roger Dingledine <arma at torproject.org>
Date:   Thu Oct 13 10:14:16 2011 -0400

    Merge branch 'maint-0.2.1' into maint-0.2.2

 changes/geoip-october2011 |    3 +
 src/config/geoip          | 5460 +++++++++++++++++++++++++++------------------
 2 files changed, 3307 insertions(+), 2156 deletions(-)