commit 80a5091e4f823a5e5d641cffd4ae460380e2ce12 Merge: f9b650f dce4603 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Nov 3 18:40:41 2016 -0400 Merge remote-tracking branch 'mintytoast/bug_19563' src/test/test_util.c | 28 ++++++++++++++++++++++++++++ src/test/test_util_format.c | 17 +++-------------- 2 files changed, 31 insertions(+), 14 deletions(-)