commit dca8ae5cfa8b081230d033158c980d50840b072a Merge: b421b3f e129393 Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 13 15:56:01 2017 -0500

Merge remote-tracking branch 'dgoulet/bug21116_030_01'

changes/bug21116 | 3 +++ src/test/test_util.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)