commit 6dba86d7c92d25b5a6eedd0dbd75dc466dcaa43a Merge: 142612bd1 1d6054f75 Author: David Goulet dgoulet@torproject.org Date: Mon Jul 29 12:02:54 2019 -0400

Merge branch 'maint-0.4.1'

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