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

Conflicts:
	src/net_packet.c

diff --cc src/net_packet.c
index 66bcfe4,e3a57b1..ac3b0cc
--- 1/src/net_packet.c
--- 2/src/net_packet.c
+++ b/src/net_packet.c
@@@ -524,7 -537,7 +524,7 @@@ static void send_udppacket(node_t *n, v
                        if(n->mtu >= origlen)
                                n->mtu = origlen - 1;
                } else
-                       logger(DEBUG_ALWAYS, LOG_ERR, "Error sending packet to %s (%s): %s", n->name, n->hostname, sockstrerror(sockerrno));
 -                      ifdebug(TRAFFIC) logger(LOG_WARNING, "Error sending packet to %s (%s): %s", n->name, n->hostname, sockstrerror(sockerrno));
++                      logger(DEBUG_TRAFFIC, LOG_WARNING, "Error sending packet to %s (%s): %s", n->name, n->hostname, sockstrerror(sockerrno));
        }
  
  end:

diff --cc src/net_setup.c
Simple merge