From: Guus Sliepen <guus@tinc-vpn.org>
Date: Mon, 2 Nov 2009 13:24:27 +0000 (+0100)
Subject: Merge branch 'master' into 1.1
X-Git-Tag: release-1.1pre1~109
X-Git-Url: https://www.tinc-vpn.org/git/browse?a=commitdiff_plain;h=108b238915c5f58b3d94ab433dc5d04e064c2b11;hp=108b238915c5f58b3d94ab433dc5d04e064c2b11;p=tinc

Merge branch 'master' into 1.1

Conflicts:
	NEWS
	README
	configure.in
	doc/tinc.texi
	doc/tincd.8.in
	src/Makefile.am
	src/connection.c
	src/edge.c
	src/meta.c
	src/net.c
	src/net.h
	src/net_packet.c
	src/net_setup.c
	src/net_socket.c
	src/node.c
	src/openssl/rsagen.h
	src/protocol_auth.c
	src/protocol_edge.c
	src/subnet.c
---