commit 402f4bcef1b4dc9d2800e02ddb5ffc217dea81c3 Merge: ba45eec e88aa98 Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 5 11:16:51 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

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