commit 1ea155b28fbe15408d96019ef0a75fe0c74ac39d Merge: e6d2059 63ceadb Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 13 16:52:16 2017 -0400

Merge branch 'bug22520_031' into maint-0.3.1

changes/bug22520 | 5 +++++ src/common/compat.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)