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

[nickm at torproject.org]

commit b683b9af00b9ddf20f68169f47f8da0b49d6fbc8
Merge: a46f498 1a1d431
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 12 11:37:56 2015 -0400

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

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