Merge commit 'fff70' into testing
Merge commit '67bfe' into testing
Merge commit 'c52b' into testing
Merge remote-tracking branch 'remotes/wxiaoguang/master' into testing
Merge remote-tracking branch 'remotes/tphelps/fiddle-bsd-fix' into testing
Set msgh.msg_controllen before calling CMSG_FIRSTHDR

It turns out that CMSG_FIRSTHDR refers to msg_controllen.  Be sure to
set it to something sane before invoking that macro.
Merge tag 'v1.3.2rc2'
Merge remote-tracking branch 'tphelps/fiddle-bsd-fix-harder'

We didn't really have to since we seem to already have that change in the code.