projects / tinc / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 108b238)
Merge branch 'master' into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Mon, 2 Nov 2009 13:24:27 +0000 (14:24 +0100)
committerGuus Sliepen <guus@tinc-vpn.org>
Mon, 2 Nov 2009 13:24:27 +0000 (14:24 +0100)
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


No differences found
tinc, the VPN daemon