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

[arma at torproject.org]

commit 7da1ae7adf150271a947997a1340f62b990c974d
Merge: 0b74f64 df17b62
Author: Roger Dingledine <arma at torproject.org>
Date:   Thu Jan 5 06:43:13 2012 -0500

    Merge branch 'maint-0.2.1' into release-0.2.1

 changes/geoip-january2012 |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)