Merge branch 'ctrl' of https://github.com/dechamps/tinc into 1.1