tinc-vpn.org Git - tinc/commit

author	Guus Sliepen <guus@tinc-vpn.org>
	Mon, 6 Jun 2011 18:42:15 +0000 (20:42 +0200)
committer	Guus Sliepen <guus@tinc-vpn.org>
	Mon, 6 Jun 2011 18:42:15 +0000 (20:42 +0200)
commit	33f241d97852d7a171f1aaf1bda7f66356ff889e
tree	a493feb22cf881670fc45722cfc44a445d9d06ce	tree \| snapshot
parent	601f3b2dd746ff5726eca256861f2ecf662b3a55	commit \| diff
parent	4b3fd94b1cc79c24c4092b6b10ed4627a2648d26	commit \| diff

Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

Conflicts:
NEWS
configure.in
doc/tincd.8.in
lib/pidfile.c
lib/pidfile.h
lib/xalloc.h
lib/xmalloc.c
src/conf.c
src/conf.h
src/connection.c
src/connection.h
src/event.c
src/graph.c
src/graph.h
src/net.c
src/net.h
src/node.h
src/openssl/crypto.c
src/process.c
src/protocol.c
src/protocol_key.c
src/route.c

27 files changed:

NEWS	diff1 \|	diff2 \|	blob \| history
configure.in	diff1 \|	diff2 \|	blob \| history
doc/tinc.texi	diff1 \|	diff2 \|	blob \| history
doc/tincd.8.in	diff1 \|	diff2 \|	blob \| history
src/bsd/device.c	diff1 \|	diff2 \|	blob \| history
src/conf.c	diff1 \|	diff2 \|	blob \| history
src/connection.c	diff1 \|	diff2 \|	blob \| history
src/connection.h	diff1 \|	diff2 \|	blob \| history
src/cygwin/device.c	diff1 \|	diff2 \|	blob \| history
src/graph.c	diff1 \|	diff2 \|	blob \| history
src/linux/device.c	diff1 \|	diff2 \|	blob \| history
src/logger.c	diff1 \|	diff2 \|	blob \| history
src/mingw/device.c	diff1 \|	diff2 \|	blob \| history
src/net.c	diff1 \|	diff2 \|	blob \| history
src/net.h	diff1 \|	diff2 \|	blob \| history
src/net_packet.c	diff1 \|	diff2 \|	blob \| history
src/node.h	diff1 \|	diff2 \|	blob \| history
src/process.c	diff1 \|	diff2 \|	blob \| history
src/protocol.c	diff1 \|	diff2 \|	blob \| history
src/protocol.h	diff1 \|	diff2 \|	blob \| history
src/protocol_misc.c	diff1 \|	diff2 \|	blob \| history
src/raw_socket/device.c	diff1 \|	diff2 \|	blob \| history
src/solaris/device.c	diff1 \|	diff2 \|	blob \| history
src/tincd.c	diff1 \|	diff2 \|	blob \| history
src/uml_socket/device.c	diff1 \|	diff2 \|	blob \| history
src/utils.c	diff1 \|	diff2 \|	blob \| history
src/utils.h	diff1 \|	diff2 \|	blob \| history

tinc, the VPN daemon

RSS Atom

NEWS	diff1 \|	diff2 \|	blob \| history
configure.in	diff1 \|	diff2 \|	blob \| history
doc/tinc.texi	diff1 \|	diff2 \|	blob \| history
doc/tincd.8.in	diff1 \|	diff2 \|	blob \| history
src/bsd/device.c	diff1 \|	diff2 \|	blob \| history
src/conf.c	diff1 \|	diff2 \|	blob \| history
src/connection.c	diff1 \|	diff2 \|	blob \| history
src/connection.h	diff1 \|	diff2 \|	blob \| history
src/cygwin/device.c	diff1 \|	diff2 \|	blob \| history
src/graph.c	diff1 \|	diff2 \|	blob \| history
src/linux/device.c	diff1 \|	diff2 \|	blob \| history
src/logger.c	diff1 \|	diff2 \|	blob \| history
src/mingw/device.c	diff1 \|	diff2 \|	blob \| history
src/net.c	diff1 \|	diff2 \|	blob \| history
src/net.h	diff1 \|	diff2 \|	blob \| history
src/net_packet.c	diff1 \|	diff2 \|	blob \| history
src/node.h	diff1 \|	diff2 \|	blob \| history
src/process.c	diff1 \|	diff2 \|	blob \| history
src/protocol.c	diff1 \|	diff2 \|	blob \| history
src/protocol.h	diff1 \|	diff2 \|	blob \| history
src/protocol_misc.c	diff1 \|	diff2 \|	blob \| history
src/raw_socket/device.c	diff1 \|	diff2 \|	blob \| history
src/solaris/device.c	diff1 \|	diff2 \|	blob \| history
src/tincd.c	diff1 \|	diff2 \|	blob \| history
src/uml_socket/device.c	diff1 \|	diff2 \|	blob \| history
src/utils.c	diff1 \|	diff2 \|	blob \| history
src/utils.h	diff1 \|	diff2 \|	blob \| history