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

[arma at torproject.org]

commit c783b828cacbb14d784cc6e5fa4acf3e6079da0a
Merge: b36a837 e7b10e5
Author: Roger Dingledine <arma at torproject.org>
Date:   Tue May 10 23:05:03 2011 -0400

    Merge branch 'maint-0.2.1' into release-0.2.1

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