From: Guus Sliepen <guus@tinc-vpn.org>
Date: Fri, 12 Nov 2010 15:15:29 +0000 (+0100)
Subject: Merge branch 'master' into 1.1
X-Git-Tag: import-tinc-1.1~544
X-Git-Url: http://git.meshlink.io/?a=commitdiff_plain;ds=sidebyside;h=a22041922f160667573e9a5ae3f4195e1668906a;hp=a22041922f160667573e9a5ae3f4195e1668906a;p=meshlink

Merge branch 'master' into 1.1

Conflicts:
	doc/tincd.8.in
	lib/pidfile.c
	src/graph.c
	src/net.c
	src/net.h
	src/net_packet.c
	src/net_setup.c
	src/net_socket.c
	src/netutl.c
	src/node.c
	src/node.h
	src/protocol_auth.c
	src/protocol_key.c
	src/tincd.c
---