commit 48b25e6811bb822542ea898e30aebc75e185f29d Merge: 94762e3 f4f9a9b Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jun 17 13:53:57 2016 -0400 Merge branch 'bug18280_029_03_nm_squashed' src/common/util_format.c | 36 +++++++++++------ src/common/util_format.h | 1 + src/test/test_util_format.c | 94 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 119 insertions(+), 12 deletions(-)