]> git.meshlink.io Git - meshlink/commit - src/net_socket.c
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)
commit108b238915c5f58b3d94ab433dc5d04e064c2b11
tree2a8336dc6d9bca3b0ebca0377a72fda23f542852
parent761517c21c37a808a19b487aa116c3c19439feca
parent44834d030464bbe1f7733caba8d96c678f1d6cf2
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
README
src/Makefile.am
src/bsd/device.c
src/connection.h
src/edge.h
src/meta.c
src/net.c
src/net_packet.c
src/net_setup.c
src/net_socket.c
src/node.h
src/process.c
src/protocol_auth.c
src/protocol_edge.c
src/protocol_subnet.c
src/route.c
src/solaris/device.c
src/subnet.c