[tor-commits] [tor/master] Merge branch 'bug15245_026' into maint-0.2.6

[nickm at torproject.org]

commit 1a1d431cff40dd92e43df892b0369cd12c3596fb
Merge: 354897a d4c1716
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 12 11:37:02 2015 -0400

    Merge branch 'bug15245_026' into maint-0.2.6

 changes/bug15245   |    5 +++++
 src/or/cpuworker.c |    8 ++++++++
 2 files changed, 13 insertions(+)