tree 0acd3094839768e8991419489657649e18ed7cbb
parent 2939d5c5fadb3f28a8f8ac85c039bfd007239d3c
parent 883bbf77bd3847d345e23f11fec582c63e158191
author Piotr Sikora <piotrsikora@google.com> 1541535357 -0800
committer Piotr Sikora <piotrsikora@google.com> 1541535357 -0800

Merge branch 'nginx' (nginx-1.15.6).

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