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

[nickm at torproject.org]

commit 27438ef7c6a34b71165480f4d2c9173278e6d854
Merge: 545e211 35699ef
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 29 21:08:26 2014 -0400

    Merge remote-tracking branch 'origin/maint-0.2.4'
    
    Doing an "ours" merge to avoid taking 35699ef9f5d2814203653e16c, which is
    a cherry-picked backport of 9686.