tree fd60564226fc45103491b990b2961a5a6df45079
parent 0f2016d26a41e22c95e29a423ad2851a29d599c9
parent c9ecb62be0d9fcbd5f2920b8e25f98c196470faf
author Piotr Sikora <piotrsikora@google.com> 1596003839 -0700
committer Piotr Sikora <piotrsikora@google.com> 1596021154 -0700

Merge branch 'nginx' (nginx-1.15.10).

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