commit a2a5bd83f0f38c3a2f46db22e87dee5657cd8160
Merge: 180e21fbc ba334c00d
Author: Nick Mathewson <[email protected]>
Date: Thu Jul 27 16:30:52 2017 -0400
Merge branch 'maint-0.3.1' into release-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(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
