Merge branch 'newhope'
authorAndreas Steffen <andreas.steffen@strongswan.org>
Wed, 10 Aug 2016 14:23:04 +0000 (16:23 +0200)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Wed, 10 Aug 2016 14:23:04 +0000 (16:23 +0200)

Trivial merge