commit 784b29a2bfc7b7ce5ef355629528a38c50b81908 Merge: e51e7bd e3efc07 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jun 21 13:54:02 2017 -0400 Merge branch 'bug22356_029' into maint-0.3.1 changes/bug22356 | 5 +++++ src/or/cpuworker.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)