Merge branch 'PHP-7.2' into PHP-7.3

author Anatol Belski <ab@php.net>

Wed, 12 Sep 2018 14:25:39 +0000 (16:25 +0200)

committer Anatol Belski <ab@php.net>

Wed, 12 Sep 2018 14:25:39 +0000 (16:25 +0200)
author Anatol Belski <ab@php.net>
Wed, 12 Sep 2018 14:25:39 +0000 (16:25 +0200)
committer Anatol Belski <ab@php.net>
Wed, 12 Sep 2018 14:25:39 +0000 (16:25 +0200)
diff --cc ext/openssl/tests/openssl_error_string_basic.phpt
Simple merge
author	Anatol Belski <ab@php.net>
	Wed, 12 Sep 2018 14:25:39 +0000 (16:25 +0200)
committer	Anatol Belski <ab@php.net>
	Wed, 12 Sep 2018 14:25:39 +0000 (16:25 +0200)