commit b0a842913acfb0de16ccb8ae358b6f6ee19d0898 Merge: 129cee1 fce425e Author: Nick Mathewson <nickm@torproject.org> Date: Wed Dec 7 11:09:27 2016 -0500 Merge branch 'maint-0.2.9' changes/19974 | 5 +++++ src/test/test_util.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)