From: Frank Denis <github@pureftpd.org>
Date: Tue, 28 Nov 2017 10:25:44 +0000 (+0100)
Subject: Merge branch 'PHP-7.2'
X-Git-Tag: php-7.3.0alpha1~934
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b44bc1bfcac94149308352b627423e827d77e2c8;p=php

Merge branch 'PHP-7.2'

* PHP-7.2:
  ext/sodium: pwhash: do not warn on low parameters but raise an explicit error if these are too low
---

b44bc1bfcac94149308352b627423e827d77e2c8