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

[nickm at torproject.org]

commit 354897a13e46cc06cb86eb1451a6d356d0402f42
Merge: a95e18b a00d07a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 12 10:54:13 2015 -0400

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