commit ba334c00da539a78fdfca696d4b53224e9354a6a Merge: ced2dd5f9 fdd8156ea Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 27 16:29:34 2017 -0400

Merge branch 'multi-priority_squashed' into maint-0.3.1

changes/bug22883-priority | 8 +++ changes/more-threads | 3 + changes/multi-priority | 5 ++ src/common/workqueue.c | 145 +++++++++++++++++++++++++++++++++++++------- src/common/workqueue.h | 14 +++++ src/or/consdiffmgr.c | 6 +- src/or/cpuworker.c | 31 +++++++--- src/or/cpuworker.h | 2 + src/test/test_consdiffmgr.c | 5 +- src/test/test_workqueue.c | 4 +- 10 files changed, 189 insertions(+), 34 deletions(-)