From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 27 Nov 2020 17:09:55 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/elmarco/tags/libslirp-pull-request' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=944fdc5e27a5b5adbb765891e8e70e88ba9a00ec;p=qemu.git

Merge remote-tracking branch 'remotes/elmarco/tags/libslirp-pull-request' into staging

# gpg: Signature made Fri 27 Nov 2020 17:06:28 GMT
# gpg:                using RSA key 87A9BD933F87C606D276F62DDAE8E10975969CE5
# gpg:                issuer "marcandre.lureau@redhat.com"
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>" [full]
# gpg:                 aka "Marc-André Lureau <marcandre.lureau@gmail.com>" [full]
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276  F62D DAE8 E109 7596 9CE5

* remotes/elmarco/tags/libslirp-pull-request:
  slirp: update to fix CVE-2020-29129 CVE-2020-29130

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

944fdc5e27a5b5adbb765891e8e70e88ba9a00ec