merge heads

diff --cc Misc/NEWS
index 16cda4232f85e39b803bbb1ef44362a889f24671,813fe543e02a9587c5cba353ed453e929a9463fd..81b98db17b19a78016654ccfcc0d7191862cabb3
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -406,8 -406,8 +406,10 @@@ Core and Builtin
  Library
  -------
  
 +- Alias resource.error to OSError ala PEP 3151.
 +
+ - Issue #5689: Add support for lzma compression to the tarfile module.
+ 
  - Issue #13248: Turn 3.2's PendingDeprecationWarning into 3.3's
    DeprecationWarning.  It covers 'cgi.escape', 'importlib.abc.PyLoader',
    'importlib.abc.PyPycLoader', 'nntplib.NNTP.xgtitle', 'nntplib.NNTP.xpath',