commit 121f4a9ca43fa88282778adac4597fac8d9deafc Merge: 48558ed d02937a Author: Nick Mathewson <nickm@torproject.org> Date: Thu Sep 11 08:30:41 2014 -0400 Merge remote-tracking branch 'public/bug13104_025' src/test/test_util.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)