Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1