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

[nickm at torproject.org]

commit f570470830503c93b4d0491eb4812dfa59e585a1
Merge: 718252b c75ee94
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 8 17:21:21 2011 -0400

    Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

 changes/geoip-august2011 |    3 +
 src/config/geoip         | 6191 ++++++++++++++++++++++++----------------------
 2 files changed, 3235 insertions(+), 2959 deletions(-)