Merge branch 'maint-0.3.5' into maint-0.4.2

author Alexander Færøy <ahf@torproject.org>

Fri, 31 Jul 2020 02:03:34 +0000 (02:03 +0000)

committer Alexander Færøy <ahf@torproject.org>

Fri, 31 Jul 2020 02:03:34 +0000 (02:03 +0000)
author Alexander Færøy <ahf@torproject.org>
Fri, 31 Jul 2020 02:03:34 +0000 (02:03 +0000)
committer Alexander Færøy <ahf@torproject.org>
Fri, 31 Jul 2020 02:03:34 +0000 (02:03 +0000)
diff --cc src/lib/buf/buffers.c
Simple merge
diff --cc src/test/test_buffers.c
Simple merge
author	Alexander Færøy <ahf@torproject.org>
	Fri, 31 Jul 2020 02:03:34 +0000 (02:03 +0000)
committer	Alexander Færøy <ahf@torproject.org>
	Fri, 31 Jul 2020 02:03:34 +0000 (02:03 +0000)
		1	2
src/lib/buf/buffers.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/test_buffers.c	patch \|	diff1 \|	diff2 \|	blob \| history