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

[arma at torproject.org]

commit 7cee98f5fdaedda4acc80768b9c9751e48025129
Merge: 101503b 9d2b384
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon Apr 4 03:55:06 2011 -0400

    Merge branch 'maint-0.2.2' into release-0.2.2

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