commit bad00108087c4c34e34966fdeb01ae1e8bb14666 Merge: 8a4635a5f 5df0b3662 Author: teor teor@torproject.org Date: Sat Aug 10 07:26:21 2019 +1000

Merge branch 'maint-0.3.5' into maint-0.4.0

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