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

[nickm at torproject.org]

commit 5633261f2e902e5b6c5956738febab9a180760d6
Merge: fe69a7e 542100d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 6 09:55:44 2015 -0400

    Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5