commit 05ef3b959d4d718e9ebb6e65e99383a4a5c8a8b2 Merge: f0fa7dc f1613b5 Author: Nick Mathewson nickm@torproject.org Date: Fri Apr 7 14:03:40 2017 -0400

Merge branch 'maint-0.3.0'

changes/bug21894_029 | 5 +++++ src/common/util_format.c | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-)