Merge branch 'android-state-updates'
authorTobias Brunner <tobias@strongswan.org>
Tue, 22 Jul 2014 08:57:57 +0000 (10:57 +0200)
committerTobias Brunner <tobias@strongswan.org>
Tue, 22 Jul 2014 09:06:31 +0000 (11:06 +0200)
commit32109a535f3f0ae3e234ebfefc7c69dfc2327c67
tree062cf0f8ce177a4f062bc8b70ccb2ea263fb13d8
parent94124456f2241f15ab9211a7ce65c1b56b25fe54
parent394be2d5563eedf284984f8180e51353af45a621
Merge branch 'android-state-updates'

The GUI reflects the state of the IKE daemon more closely by switching
back to the "connecting" state when the IKE_SA or CHILD_SA is down and
is getting reestablished.

Fixes #616.