commit 78cb55e42fd5188733f714f8db518ecc02f7f380 Merge: 9b37d54 fce425e Author: Nick Mathewson nickm@torproject.org Date: Wed Dec 7 11:09:23 2016 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

changes/19974 | 5 +++++ src/test/test_util.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)