tree bb7e5b1557ef32b34840dbc11c0d83ff8313aa25
parent ce94eba2042d52a0ba3d9e252ebce86715e94275
parent 69b0d71870eca29f04d59da277a42d6515c3edd6
author Marc-André Lureau <marcandre.lureau@gmail.com> 1606495633 +0000
committer Marc-André Lureau <marcandre.lureau@gmail.com> 1606495633 +0000

Merge branch 'stable-4.2' into 'stable-4.2'

stable-4.2: Fix CVE-2020-29129, CVE-2020-29130

See merge request slirp/libslirp!58