Merge remote-tracking branch 'volth/release-1.1pre16-rtt' into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Wed, 13 Jun 2018 20:23:27 +0000 (22:23 +0200)
committerGuus Sliepen <guus@tinc-vpn.org>
Wed, 13 Jun 2018 20:26:49 +0000 (22:26 +0200)
commit22ae0c3549628739ca7c40e48ce1a276469ded92
tree23a51a06107b0459b252c3526285c8fdbe2bf6d3
parent15341e7697fe88a9f3b4646a2cb784dc515609bd
parent70e1e467f93f885da3e49289e96757d5cd2ae5ba
Merge remote-tracking branch 'volth/release-1.1pre16-rtt' into 1.1

Also, reformat the code and fix a compiler warning.
src/info.c
src/net_packet.c
src/tincctl.c