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

[nickm at torproject.org]

commit 52bf1556b18a3af0d7d4f612cd27e956353bf5b5
Merge: 88bb48e 6bdfa29
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 13 12:51:28 2012 -0500

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

 changes/geoip-dec2012 |    3 +
 changes/geoip-nov2012 |    3 +
 src/config/geoip      |124323 ++++++++++---------------------------------------
 3 files changed, 25861 insertions(+), 98468 deletions(-)