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

[arma at torproject.org]

commit 6d5478a8a7734553fc84574e725625610f46dc8c
Merge: e6980fa 7206d78
Author: Roger Dingledine <arma at torproject.org>
Date:   Tue May 10 23:06:12 2011 -0400

    Merge branch 'maint-0.2.2'

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