projects / tinc / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 6dfdb32)
Merge branch 'master' into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Sun, 30 Sep 2012 13:00:47 +0000 (15:00 +0200)
committerGuus Sliepen <guus@tinc-vpn.org>
Sun, 30 Sep 2012 13:00:47 +0000 (15:00 +0200)
Conflicts:
lib/utils.c
src/net_setup.c
src/process.c
src/protocol_auth.c
src/protocol_key.c
src/utils.h


No differences found
tinc, the VPN daemon