tree b438fbc5f46a1de67dfa66c388ac7a570ed582e5
parent 371e98fc1d5cd168f180513d7e15e497cfb406eb
parent e407815631dac1832124f3dd49f9668419b5ea01
author Piotr Sikora <piotrsikora@google.com> 1618739420 -0700
committer Piotr Sikora <piotrsikora@google.com> 1618739420 -0700

Merge branch 'nginx' (nginx-1.19.10).

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