tree a7fb3f55053301768c8c57e5e4e89efe03cb01be
parent 889c309f4bbd5bcc556acb8f7d4928201eae8774
parent 743ddd803eb023587b3820da9af96e861fee6a61
author Piotr Sikora <piotrsikora@google.com> 1540267801 -0700
committer Piotr Sikora <piotrsikora@google.com> 1540267801 -0700

Merge branch 'nginx' (nginx-1.15.5).

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