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)
commit5c32bd1578d59e005f634621d17ca96af32bb630
treea85090ad0e5a419fe29dc42e6448ed63d7be83a2
parentaa52300b2b6e9d923d6d5b8c95fa500f549620d0
parent1a7a9078c093f77950192c32be009bbe463fe372
parent2cb216d83d825fcca2fa2b66c756b253f8f0828b
Merge remote-tracking branches 'dechamps/sptpsrestart' and 'dechamps/keychanged' into 1.1
src/protocol_key.c