commit 8c92ffab226419d9a74666f5509c978b7bdf9011 Merge: 887d86b 79798a2 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Aug 10 11:49:04 2015 -0400 Merge remote-tracking branch 'dgoulet/bug16274_027_02' changes/bug16274 | 5 +++++ src/common/compat.c | 24 ++++++++++++++++-------- 2 files changed, 21 insertions(+), 8 deletions(-)