From: Guus Sliepen <guus@tinc-vpn.org>
Date: Thu, 8 Mar 2012 20:15:08 +0000 (+0100)
Subject: Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1
X-Git-Tag: release-1.1pre3~142
X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=40c28589328a2aa96c2ce1419c5d90616c758b3d

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

Conflicts:
	src/net_packet.c
---

40c28589328a2aa96c2ce1419c5d90616c758b3d
diff --cc src/net_packet.c
index 66bcfe4b,e3a57b17..ac3b0cc5
--- a/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: