tree c876b8545817f053201ced77316cd56349d9c318
parent cfc4269aecbc8a1c709313865cb044c4a2c88065
parent 3ab861801cfee537e2b7955e7aa12e9608f4f16c
author Piotr Sikora <piotrsikora@google.com> 1597166374 -0700
committer Piotr Sikora <piotrsikora@google.com> 1597166374 -0700

Merge branch 'nginx' (nginx-1.19.2).

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