bridge: Fix mismerges from r360345
In r362650 we merged r360345. This required manual changes due to the
differences in EPOCH macros between head and stable/12, and was done
imperfectly.
This is a direct commit to stable/12.
PR: 248046
bridge: Fix mismerges from r360345 Tags None Referenced Files None Subscribers None
Description
Details
|