tree b892635976af9dd2bb7b8ebba9a1e8b54d6db9e6
parent 00e7f4afb06ebf1ca9abd22b22b20d035bb88db3
parent 2d9922901bdb0b9500f8d138209a04089e6b356d
author Piotr Sikora <piotrsikora@google.com> 1596007267 -0700
committer Piotr Sikora <piotrsikora@google.com> 1596021303 -0700

Merge branch 'nginx' (nginx-1.17.2).

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