commit afc22ec5396e677c8cc3f7f14ecec7dc02a75b63 Merge: 7aa9fc163 a56451af4 Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 22 08:49:55 2018 -0400

Merge remote-tracking branch 'tor-github/pr/421'

src/lib/evloop/workqueue.c | 6 +++--- src/lib/evloop/workqueue.h | 1 - 2 files changed, 3 insertions(+), 4 deletions(-)