commit 3321e4a0254bdaa023dd961cda6ba6636a67c879 Merge: 596de49 28370fe Author: Nick Mathewson nickm@torproject.org Date: Fri Oct 2 12:40:30 2015 +0200

Merge remote-tracking branch 'twstrike/util_format_tests'

src/test/include.am | 1 + src/test/test.c | 3 +- src/test/test_util_format.c | 197 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 200 insertions(+), 1 deletion(-)