[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

[nickm at torproject.org]

commit 15ed1c0c833ae30dd7560da3280cd8ca084ff566
Merge: c2844d537 ba334c00d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 27 16:30:52 2017 -0400

    Merge branch '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(-)