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

[arma at torproject.org]

commit 96da10aace8aa9486872a21986a191b07821a506
Merge: bc607be 83e3975
Author: Roger Dingledine <arma at torproject.org>
Date:   Sun Jun 5 11:14:28 2011 -0400

    Merge branch 'maint-0.2.2'

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