commit e04cc7e27fdc4ae4767ec29be08609a5e3540f83 Merge: cd77ea7 e88aa98 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jul 5 11:16:51 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22797 | 4 ++++ src/common/compat.c | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-)