From: Maria Matejka Date: Tue, 20 Sep 2022 11:10:29 +0000 (+0200) Subject: Merge commit 'df476c2e' into thread-next X-Git-Tag: v3.0-alpha1~121 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a00e0b5930b6f1e56eed65cb5250aa9120a6f506;p=thirdparty%2Fbird.git Merge commit 'df476c2e' into thread-next Implemented the corking by our own commit, merging with "ours" strategy. --- a00e0b5930b6f1e56eed65cb5250aa9120a6f506