commit 73d2f335c5ea13d9f8b8e6d3b4dd200057db70b3 Merge: cd029f0 857ae34 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Feb 20 12:53:49 2012 -0500 Merge remote-tracking branch 'pmezard/armv5' src/test/test_util.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)