commit 11b2d36db3b14fb1fd17b021757764bb898b7440 Merge: 4d52b74 1ea155b Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 13 16:52:20 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

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