tree b25398bc872bb3897969a03f39df3272982dcbe0
parent 36f0f480c02103b8f8324778234ffd8148788b2b
parent cd35490fae8ef3b67ddb021228ecf22da62aa146
author Piotr Sikora <piotrsikora@google.com> 1596012716 -0700
committer Piotr Sikora <piotrsikora@google.com> 1596021605 -0700

Merge branch 'nginx' (nginx-1.19.0).

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