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

[arma at torproject.org]

commit 0582746e0d25ef07e925521f9e6eb272725f64ee
Merge: 6171bdd ff2c9ac
Author: Roger Dingledine <arma at torproject.org>
Date:   Thu Dec 8 04:40:15 2011 -0500

    Merge branch 'maint-0.2.1' into maint-0.2.2

 changes/geoip-december2011 |    3 +
 src/config/geoip           |10429 ++++++++++++++++++++++++++++----------------
 2 files changed, 6660 insertions(+), 3772 deletions(-)