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

[nickm at torproject.org]

commit 9da17ad410b0b510c2e8cdaa2168fd020f3dc8c2
Merge: 01e2aae 14bc6e8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 1 11:45:38 2014 -0400

    Merge remote-tracking branch 'origin/maint-0.2.4'
    
    (this is an "ours" merge, to avoid taking 6a4f5d9b4d into 0.2.5: that
    commit downgrades the bug 7164 warning in versions <= 0.2.4 because it
    isn't as useful as the one 0.2.5 has)