commit a25d97e53046132567fd78e82791a2f8cad7b199 Merge: 3cace828a 878e0d45a Author: Nick Mathewson <nickm@torproject.org> Date: Mon Sep 11 16:28:59 2017 -0400 Merge branch 'teor-bug22797-025' into maint-0.2.9 changes/bug22797 | 4 ++++ src/common/compat.c | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-)