Merge commit 'c7e843c1' into thread-merge-2.16

author Maria Matejka <mq@ucw.cz>

Fri, 29 Nov 2024 09:28:19 +0000 (10:28 +0100)

committer Maria Matejka <mq@ucw.cz>

Fri, 29 Nov 2024 09:28:19 +0000 (10:28 +0100)
author Maria Matejka <mq@ucw.cz>
Fri, 29 Nov 2024 09:28:19 +0000 (10:28 +0100)
committer Maria Matejka <mq@ucw.cz>
Fri, 29 Nov 2024 09:28:19 +0000 (10:28 +0100)
diff --cc doc/bird.sgml
Simple merge
diff --cc proto/bgp/bgp.c
Simple merge
diff --cc proto/bgp/packets.c
Simple merge
author	Maria Matejka <mq@ucw.cz>
	Fri, 29 Nov 2024 09:28:19 +0000 (10:28 +0100)
committer	Maria Matejka <mq@ucw.cz>
	Fri, 29 Nov 2024 09:28:19 +0000 (10:28 +0100)
		1	2
doc/bird.sgml	patch \|	diff1 \|	diff2 \|	blob \| history
proto/bgp/bgp.c	patch \|	diff1 \|	diff2 \|	blob \| history
proto/bgp/packets.c	patch \|	diff1 \|	diff2 \|	blob \| history