commit f4e053d6dff0b868449a8c225c2062b42083733f Merge: b3c988f 8e388bc Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 21 17:25:51 2011 -0500

Merge branch 'bug4518' into maint-0.2.2

changes/bug4518 | 4 ++++ src/or/cpuworker.c | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)