commit 40f385dee73295695222c63a2ce0c62aa808e11c Merge: 2fc33716e 6a49e3360 Author: Nick Mathewson nickm@torproject.org Date: Mon Sep 11 16:29:10 2017 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

changes/bug22797 | 4 ++++ src/common/compat.c | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-)