commit 8c2ccf93709d2a842485d15724d5a3e03eabfe32 Merge: a2a5bd83f af3079a49 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jul 27 20:33:01 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 src/common/workqueue.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)