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

[arma at torproject.org]

commit 83e3975c8bebb3f0aeb95d672e09d31797f7bd6a
Merge: 7aa20b2 bf4b819
Author: Roger Dingledine <arma at torproject.org>
Date:   Sun Jun 5 11:13:50 2011 -0400

    Merge branch 'maint-0.2.1' into maint-0.2.2

 changes/geoip-june2011 |    3 +
 src/config/geoip       | 5398 +++++++++++++++++++++++++++++++++---------------
 2 files changed, 3789 insertions(+), 1612 deletions(-)