From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 12 Sep 2014 08:24:48 +0000 (+0200)
Subject: Merge branch 'android-pfs'
X-Git-Tag: 5.2.1dr1~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f640af5b7a68bd5230e07eb54fe7432a240192d8;p=thirdparty%2Fstrongswan.git

Merge branch 'android-pfs'

Changes how CHILD_SA rekeying errors are handled in the Android app and adds
CHILD_SA proposals with DH groups.
---

f640af5b7a68bd5230e07eb54fe7432a240192d8