Merge branch 'master' into 1.1
[tinc] / src / bsd /
drwxr-xr-x   ..
-rw-r--r-- 7547 device.c