Merge commit 'deec84ca3' into thread-next

author Maria Matejka <mq@ucw.cz>

Mon, 10 Mar 2025 09:29:44 +0000 (10:29 +0100)

committer Maria Matejka <mq@ucw.cz>

Mon, 10 Mar 2025 09:29:44 +0000 (10:29 +0100)
author Maria Matejka <mq@ucw.cz>
Mon, 10 Mar 2025 09:29:44 +0000 (10:29 +0100)
committer Maria Matejka <mq@ucw.cz>
Mon, 10 Mar 2025 09:29:44 +0000 (10:29 +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>
	Mon, 10 Mar 2025 09:29:44 +0000 (10:29 +0100)
committer	Maria Matejka <mq@ucw.cz>
	Mon, 10 Mar 2025 09:29:44 +0000 (10:29 +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