commit f1613b53c57af05250b71f31eda037bf82f1e725 Merge: a5b50ef 4812441 Author: Nick Mathewson nickm@torproject.org Date: Fri Apr 7 14:03:25 2017 -0400

Merge remote-tracking branch 'public/bug21894_029' into maint-0.3.0

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