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

[nickm at torproject.org]

commit 579808d4cdc62346fffa364900d0d76cfa28b3e1
Merge: cfa07f3 52bf155
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Dec 13 12:52:44 2012 -0500

    Merge remote-tracking branch 'origin/maint-0.2.3'
    
    Conflicts:
    	src/config/geoip

 src/config/geoip |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)