From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 22 Jul 2014 08:57:57 +0000 (+0200)
Subject: Merge branch 'android-state-updates'
X-Git-Tag: 5.2.1dr1~116
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=32109a535f3f0ae3e234ebfefc7c69dfc2327c67;p=thirdparty%2Fstrongswan.git

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.
---

32109a535f3f0ae3e234ebfefc7c69dfc2327c67