Merge pull request #6424 from delroth/traversal-watchdog Add systemd watchdog support to the traversal server