tree 6656b418c8a637a562870788cc563fe91f92e1b9
parent 1f5baff03885ff766690795880981bed39a52aa0
parent 5ba3724b07eec6d0807121135ed9e20add8946b5
author Piotr Sikora <piotrsikora@google.com> 1604090697 -0700
committer Piotr Sikora <piotrsikora@google.com> 1604090697 -0700

Merge branch 'nginx' (nginx-1.19.4).

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