tree cfb3e6ea545aca273b8cfeddffd7fdf6d8c60625
parent ef38ae736495cd67f4fe0bf5ca20ff6b8721ad45
parent 5eb73721f21838435685181a555175b3c8247df7
author Piotr Sikora <piotrsikora@google.com> 1596005002 -0700
committer Piotr Sikora <piotrsikora@google.com> 1596021210 -0700

Merge branch 'nginx' (nginx-1.15.12).

Change-Id: If891b85a8d610b1b7d906fe8ccde4614aba9da03
Signed-off-by: Piotr Sikora <piotrsikora@google.com>