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

[arma at torproject.org]

commit 9d2b3849b2052bc6b54028c658a8b27fae452ea4
Merge: 65eb0e4 0cdd262
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon Apr 4 03:53:38 2011 -0400

    Merge branch 'maint-0.2.1' into maint-0.2.2

 changes/geoip-apr2011 |    3 +
 src/config/geoip      | 6197 ++++++++++++++++++++++++++++++++++---------------
 2 files changed, 4341 insertions(+), 1859 deletions(-)