commit 8258eac291341cf493f6ddaf5c4d8541fd57729b Merge: f7f4154 dc1d6ae Author: David Goulet dgoulet@torproject.org Date: Fri Apr 20 10:54:42 2018 -0400

Merge remote-tracking branch 'yawning/bug23715'

src/common/compat.h | 4 ++++ src/lib/syscall.c | 17 +++++++++++++++++ 2 files changed, 21 insertions(+)