tinc-vpn.org Git - tinc/commit

author	Guus Sliepen <guus@tinc-vpn.org>
	Mon, 2 Nov 2009 13:24:27 +0000 (14:24 +0100)
committer	Guus Sliepen <guus@tinc-vpn.org>
	Mon, 2 Nov 2009 13:24:27 +0000 (14:24 +0100)
commit	108b238915c5f58b3d94ab433dc5d04e064c2b11
tree	2a8336dc6d9bca3b0ebca0377a72fda23f542852	tree \| snapshot
parent	761517c21c37a808a19b487aa116c3c19439feca	commit \| diff
parent	44834d030464bbe1f7733caba8d96c678f1d6cf2	commit \| diff

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

19 files changed:

NEWS	diff1 \|	diff2 \|	blob \| history
README	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/bsd/device.c	diff1 \|	diff2 \|	blob \| history
src/connection.h	diff1 \|	diff2 \|	blob \| history
src/edge.h	diff1 \|	diff2 \|	blob \| history
src/meta.c	diff1 \|	diff2 \|	blob \| history
src/net.c	diff1 \|	diff2 \|	blob \| history
src/net_packet.c	diff1 \|	diff2 \|	blob \| history
src/net_setup.c	diff1 \|	diff2 \|	blob \| history
src/net_socket.c	diff1 \|	diff2 \|	blob \| history
src/node.h	diff1 \|	diff2 \|	blob \| history
src/process.c	diff1 \|	diff2 \|	blob \| history
src/protocol_auth.c	diff1 \|	diff2 \|	blob \| history
src/protocol_edge.c	diff1 \|	diff2 \|	blob \| history
src/protocol_subnet.c	diff1 \|	diff2 \|	blob \| history
src/route.c	diff1 \|	diff2 \|	blob \| history
src/solaris/device.c	diff1 \|	diff2 \|	blob \| history
src/subnet.c	diff1 \|	diff2 \|	blob \| history

tinc, the VPN daemon

RSS Atom

NEWS	diff1 \|	diff2 \|	blob \| history
README	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	diff1 \|	diff2 \|	blob \| history
src/bsd/device.c	diff1 \|	diff2 \|	blob \| history
src/connection.h	diff1 \|	diff2 \|	blob \| history
src/edge.h	diff1 \|	diff2 \|	blob \| history
src/meta.c	diff1 \|	diff2 \|	blob \| history
src/net.c	diff1 \|	diff2 \|	blob \| history
src/net_packet.c	diff1 \|	diff2 \|	blob \| history
src/net_setup.c	diff1 \|	diff2 \|	blob \| history
src/net_socket.c	diff1 \|	diff2 \|	blob \| history
src/node.h	diff1 \|	diff2 \|	blob \| history
src/process.c	diff1 \|	diff2 \|	blob \| history
src/protocol_auth.c	diff1 \|	diff2 \|	blob \| history
src/protocol_edge.c	diff1 \|	diff2 \|	blob \| history
src/protocol_subnet.c	diff1 \|	diff2 \|	blob \| history
src/route.c	diff1 \|	diff2 \|	blob \| history
src/solaris/device.c	diff1 \|	diff2 \|	blob \| history
src/subnet.c	diff1 \|	diff2 \|	blob \| history