Merge branch 'next' into dfsg-debian

diff --cc debian/changelog
index 21c2f8c6c814ccdd8854eb5cf70c4e1ccebf67e2,f7f3daee2af991ccef461dd218204f3d3b32dbcd..65fb236cef4cedab87bfda9fac81877e01d210a3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,14 +1,18 @@@
- tar (1.29b-2) UNRELEASED; urgency=medium
 -tar (1.29b-3) UNRELEASED; urgency=medium
++tar (1.29b-2) unstable; urgency=medium
  
 +  * add suggests tar-doc, closes: #856958
+   * dump test results into build log on make check failure for kfreebsd team
  
-  -- Bdale Garbee <bdale@gag.com>  Thu, 08 Jun 2017 12:27:13 -0600
+  -- Bdale Garbee <bdale@gag.com>  Thu, 08 Jun 2017 12:20:20 -0600
  
 -tar (1.29b-2) unstable; urgency=medium
 +tar (1.29b-1.1) unstable; urgency=medium
  
 -  * add suggests tar-doc, closes: #856958
 +  * Non-maintainer upload.
 +  * CVE-2016-6321: Bypassing the extract path name.
 +    When extracting, member names containing '..' components are skipped.
 +    (Closes: #842339)
  
 - -- Bdale Garbee <bdale@gag.com>  Tue, 07 Mar 2017 08:49:50 -0700
 + -- Salvatore Bonaccorso <carnil@debian.org>  Sun, 30 Oct 2016 07:35:31 +0100
  
  tar (1.29b-1) unstable; urgency=medium