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

[nickm at torproject.org]

commit e4abac08a2ade5329594dcc220a02b3b680cb9e8
Merge: ad49b8a 758428d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 25 10:19:46 2012 -0400

    Merge remote-tracking branch 'origin/maint-0.2.3'
    
    (Using an -s ours merge for Not taking the CVE-2012-2250 fix from
    maint-0.2.3; it would conflict.)