From: Xinchen Hui <laruence@gmail.com>
Date: Wed, 29 Nov 2017 06:54:05 +0000 (+0800)
Subject: Merge branch 'PHP-7.2'
X-Git-Tag: php-7.3.0alpha1~920
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=60c742979dd04779437de83f7113f57a88a5d7f3;p=php

Merge branch 'PHP-7.2'

* PHP-7.2:
  Update NEWS
  Fixed bug #75573 (Segmentation fault in 7.1.12 and 7.0.26)
  Revert "ext/sodium: pwhash: do not warn on low parameters"

Conflicts:
	Zend/zend_object_handlers.c
---

60c742979dd04779437de83f7113f57a88a5d7f3