Merge commit '3859e4efc1597368df647323c5a3cc1771cb64ca' into thread-next

author Maria Matejka <mq@ucw.cz>

Sat, 21 Jan 2023 22:45:13 +0000 (23:45 +0100)

committer Maria Matejka <mq@ucw.cz>

Sat, 21 Jan 2023 22:45:13 +0000 (23:45 +0100)
author Maria Matejka <mq@ucw.cz>
Sat, 21 Jan 2023 22:45:13 +0000 (23:45 +0100)
committer Maria Matejka <mq@ucw.cz>
Sat, 21 Jan 2023 22:45:13 +0000 (23:45 +0100)
diff --cc doc/bird.sgml
Simple merge
diff --cc proto/bgp/bgp.c
Simple merge
diff --cc proto/bgp/bgp.h
Simple merge
diff --cc proto/bgp/config.Y
Simple merge
diff --cc proto/bgp/packets.c
Simple merge
author	Maria Matejka <mq@ucw.cz>
	Sat, 21 Jan 2023 22:45:13 +0000 (23:45 +0100)
committer	Maria Matejka <mq@ucw.cz>
	Sat, 21 Jan 2023 22:45:13 +0000 (23:45 +0100)
		1	2
doc/bird.sgml	patch \|	diff1 \|	diff2 \|	blob \| history
proto/bgp/bgp.c	patch \|	diff1 \|	diff2 \|	blob \| history
proto/bgp/bgp.h	patch \|	diff1 \|	diff2 \|	blob \| history
proto/bgp/config.Y	patch \|	diff1 \|	diff2 \|	blob \| history
proto/bgp/packets.c	patch \|	diff1 \|	diff2 \|	blob \| history