[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/694'

[nickm at torproject.org]

commit 1239e411a767e39905edbf95acc09284f161a0ea
Merge: 0db0b4769 b53fee462
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 19 11:31:22 2019 -0500

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

 changes/ticket29067                   | 3 +++
 src/test/test_workqueue_cancel.sh     | 2 +-
 src/test/test_workqueue_efd.sh        | 2 +-
 src/test/test_workqueue_efd2.sh       | 2 +-
 src/test/test_workqueue_pipe.sh       | 2 +-
 src/test/test_workqueue_pipe2.sh      | 2 +-
 src/test/test_workqueue_socketpair.sh | 2 +-
 7 files changed, 9 insertions(+), 6 deletions(-)