Merge commit '93bf91b4012a28610672d2266366dfa0a663b70f' into HEAD
This fixes a warning in wireguard-tools, as well as two issues pointed out by
FreeBSD's Coverity instance.
CID: 1500405, 1500421
(cherry picked from commit 2cb43631ab122ee0b2a3a101003b73415a9bf963)