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

[nickm at torproject.org]

commit 2fae74d6c3e84eef24d628f55898c27a2ffa23f7
Merge: 452aa18 a83abcf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 20 13:55:55 2014 -0400

    Merge remote-tracking branch 'origin/maint-0.2.4'
    
    This is an "ours" merge, taking nothing, since we already had the
    changes that were in a83abcf5ee5cb8fe245bc97e0