commit e78a7450a2990a75380885786a5840f15f482131 Merge: 3b8bf743ae 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 maint-0.4.3

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