tree d6899c74775aff914c00d9afc9667a62623bad34
parent 7a5980cfbe12c93dceaa74b024f1503e60114539
parent 1a09557d5bb4a86e76a0299fe3dd2b16748d0924
author Piotr Sikora <piotrsikora@google.com> 1625781245 -0700
committer Piotr Sikora <piotrsikora@google.com> 1625781245 -0700

Merge branch 'nginx' (nginx-1.21.1).

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