commit 3c8a7cb54c2b1bccdf1326d9d5b962bb61a02167 Merge: 99bc2ac5a 1d6054f75 Author: David Goulet dgoulet@torproject.org Date: Mon Jul 29 12:02:54 2019 -0400

Merge branch 'maint-0.4.1' into release-0.4.1

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