[tor-commits] [tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

[nickm at torproject.org]

commit c2dcd9b703b494b404200c6330ef9f0511b79925
Merge: 8a060d8 9063f29
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 12 12:50:41 2015 -0400

    Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
    
    ("-s ours" merge to avoid taking reversion of #15064)