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

[nickm at torproject.org]

commit 9292a78722e0f24d06e15215ba25f05e534646d6
Merge: af12a7a 2b7bdc2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 14 11:10:45 2011 -0500

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

 changes/geoip-november2011 |    3 +
 src/config/geoip           | 5098 ++++++++++++++++++++++++++++----------------
 2 files changed, 3302 insertions(+), 1799 deletions(-)