From: Guus Sliepen <guus@tinc-vpn.org>
Date: Fri, 19 Nov 2010 12:22:48 +0000 (+0000)
Subject: Merge branch 'master' into 1.1
X-Git-Tag: release-1.1pre1~67
X-Git-Url: http://tinc-vpn.org/git/browse?a=commitdiff_plain;h=886a6f61a1f4cc48a77b42d10f34f9126377d904;hp=886a6f61a1f4cc48a77b42d10f34f9126377d904;p=tinc

Merge branch 'master' into 1.1

Conflicts:
	src/net_packet.c
	src/openssl/rsagen.h
	src/protocol_auth.c
	src/protocol_key.c
---