tree 782938c2740bc9de864f1e60caca60ad16150e76
parent f5bf2d17902d1b504faac1a266883dab29dbff75
parent 562e91aa50c7edfeeb321e4e50181d0f8a0ff64f
author Piotr Sikora <piotrsikora@google.com> 1543376793 -0800
committer Piotr Sikora <piotrsikora@google.com> 1543376793 -0800

Merge branch 'nginx' (nginx-1.15.7).

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