[tor-commits] [tor/master] Merge branch 'tor-github/pr/1054'

[dgoulet at torproject.org]

commit ef9170db4cc936c7154d8be7626f9c57f75c0049
Merge: 61bd8f428 8f0b29961
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu May 30 09:59:21 2019 -0400

    Merge branch 'tor-github/pr/1054'

 changes/bug30561        |  6 ++++++
 src/lib/string/printf.c | 16 +++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)