commit 1d6054f75065214c55d17796cf1587692fbb5cea Merge: d8264ab62 8bbec36b3 Author: David Goulet dgoulet@torproject.org Date: Mon Jul 29 12:02:47 2019 -0400

Merge branch 'tor-github/pr/1179' into maint-0.4.1

changes/ticket31001 | 6 ++++++ src/lib/string/printf.c | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-)