Merge branch 'master' of black:tinc

diff --cc doc/tinc.conf.5.in
Simple merge

diff --cc doc/tinc.texi
Simple merge

diff --cc src/linux/device.c
Simple merge

diff --cc src/net_setup.c
Simple merge