Merge branch 'master' into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Fri, 19 Nov 2010 12:22:48 +0000 (12:22 +0000)
committerGuus Sliepen <guus@tinc-vpn.org>
Fri, 19 Nov 2010 12:22:48 +0000 (12:22 +0000)
commit886a6f61a1f4cc48a77b42d10f34f9126377d904
tree936d378c3a4554edffac0a0797ca142085dca75d
parent23dddc25930bc9033e5a2ac659376032aff44d82
parentd91903ef3c2a1f4481ae8757bb2b14282f2b7e68
Merge branch 'master' into 1.1

Conflicts:
src/net_packet.c
src/openssl/rsagen.h
src/protocol_auth.c
src/protocol_key.c
src/dropin.c
src/linux/device.c
src/net.h
src/net_packet.c
src/net_setup.c
src/net_socket.c
src/node.c
src/node.h
src/process.c
src/protocol_key.c