[tor-commits] [tor/master] Merge branch 'ticket26008'

[nickm at torproject.org]

commit 2a4439adf37ed75c8f7d2db3134d0263f70de796
Merge: bf5eaa82d 6e3e96d2f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 8 14:09:38 2018 -0400

    Merge branch 'ticket26008'

 changes/ticket26008       |  7 +++++++
 src/test/test_workqueue.c | 12 +++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)