commit d1493f2f277641dc5657f4114e305b5390ef020e Merge: fe52c87652 c93114ec9e Author: Alexander Færøy ahf@torproject.org Date: Mon Nov 8 14:14:03 2021 +0000

Merge remote-tracking branch 'tor-gitlab/mr/485' into main

changes/bug40355_part2 | 4 ++++ configure.ac | 4 +++- src/feature/api/tor_api.c | 4 +++- src/lib/cc/compat_compiler.h | 31 +++++++++++++++++++++++++------ src/lib/string/printf.c | 4 ++-- 5 files changed, 37 insertions(+), 10 deletions(-)