From: Tim Kientzle <kientzle@acm.org>
Date: Sat, 30 Apr 2016 04:41:49 +0000 (-0700)
Subject: Merge branch 'vu862384'
X-Git-Tag: v3.2.0~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b7c2800b5cc57002eec3f83226d345d48c6796a;p=thirdparty%2Flibarchive.git

Merge branch 'vu862384'

Fixes Issue 656
Fixes CVE-2016-1541
Fixes VU#862384
Fixes TALOS-CAN-155
---

2b7c2800b5cc57002eec3f83226d345d48c6796a