commit 529b98967538b0a942ded2e4739591c9fe01d8e1 Merge: 5f4601f5aa 4e684c8695 Author: Alexander Færøy ahf@torproject.org Date: Fri Jul 31 02:03:34 2020 +0000

Merge branch 'maint-0.4.2' into release-0.4.2

changes/bug40076 | 5 ++++ src/lib/buf/buffers.c | 2 ++ src/test/test_buffers.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+)