Merge branch 'hardened/current/chacha' into hardened/current/ptrace
Revert "HBSD: try to resolve/avoid merge conflict"

This reverts commit 2e5b51198b54f46e013eebe585832447e931b72b.
Merge branch 'hardened/current/ptrace' of https://github.com/hardenedbsd/hardenedbsd into hardened/current/ptrace
PTRACE: slight changes.
Merge branch 'hardened/current/ptrace' of github.com:HardenedBSD/hardenedBSD into hardened/current/ptrace
Merge branch 'hardened/current/ptrace' into hardened/current/unstable