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

[nickm at torproject.org]

commit cb24852ec57908da0a8d2d724ee5e52bf9e182b8
Merge: 19d3720 1625cdd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 14 14:24:53 2013 -0500

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

 changes/geoip-jan2013 |    3 +
 src/config/geoip      |19722 ++++++++++++++++++-------------------------------
 2 files changed, 7151 insertions(+), 12574 deletions(-)