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

[arma at torproject.org]

commit 7206d784dc3def970d5bd8618242f7b9c9c71e37
Merge: ec25c1f e7b10e5
Author: Roger Dingledine <arma at torproject.org>
Date:   Tue May 10 23:05:51 2011 -0400

    Merge branch 'maint-0.2.1' into maint-0.2.2

 changes/geoip-may2011 |    3 +
 src/config/geoip      | 6479 +++++++++++++++++++++++++++++++++----------------
 2 files changed, 4392 insertions(+), 2090 deletions(-)