commit 03e521670059c1b29f8b0068b8fe86700183b884 Merge: e9a315c f1613b5 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Apr 7 14:03:37 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug21894_029 | 5 +++++ src/common/util_format.c | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-)