[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

[arma at torproject.org]

commit a5610cfa64189db693dbad3efaa973d6720c42fe
Merge: 4107ddd 8611195
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Aug 25 00:33:10 2013 -0400

    Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
    
    (Using "ours" strategy to avoid taking 9546 fix in 0.2.3; we just
    merged our own into 0.2.4)