tree 803648c91346e5ade5be0af05708e66a48e31394
parent d189ce1ea39bf3266e2ef3f684f933a811a53b56
parent cdefe92a03f27aa32805b0b3a53b9aea41594781
author Piotr Sikora <piotrsikora@google.com> 1596010988 -0700
committer Piotr Sikora <piotrsikora@google.com> 1596021506 -0700

Merge branch 'nginx' (nginx-1.17.8).

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