From 25b87f57639318807c3b747b44de02bf07f2ee7b Mon Sep 17 00:00:00 2001
From: Sirius902 <3645979-Sirius902@users.noreply.gitlab.com>
Date: Thu, 27 Aug 2020 12:26:52 -0700
Subject: [PATCH] Merge upstream

---
 tools/ZAP2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/ZAP2 b/tools/ZAP2
index a781b7b098..15fcb21d2c 160000
--- a/tools/ZAP2
+++ b/tools/ZAP2
@@ -1 +1 @@
-Subproject commit a781b7b098472076f99f52e4ad214823ea91be2d
+Subproject commit 15fcb21d2c4e2ef2f720d28a0f7dec259ddd06f5