commit c3debdfe6cef2382d4807a3f9292dd7bd87965a5 Merge: 3a7e2ce1b c894e9d3d Author: Nick Mathewson <nickm@torproject.org> Date: Mon Sep 11 16:29:10 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug22797 | 4 ++++ src/common/compat.c | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-)