projects / tinc / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa52300 1a7a907 2cb216d)
Merge remote-tracking branches 'dechamps/sptpsrestart' and 'dechamps/keychanged'...
authorGuus Sliepen <guus@tinc-vpn.org>
Sun, 17 May 2015 19:07:45 +0000 (21:07 +0200)
committerGuus Sliepen <guus@tinc-vpn.org>
Sun, 17 May 2015 19:07:45 +0000 (21:07 +0200)
1  2  3 
src/protocol_key.c patch | diff1 | diff2 | diff3 | blob | history

diff --cc src/protocol_key.c
Simple merge
tinc, the VPN daemon