Issue #20387: Merge

diff --cc Misc/NEWS
index d1f6242b5f482002425877c649aa888085019980,f2539d1f8bd5eda04934b8077fd43f2249dde674..1e1eba6944a3eff3ba842d8e87c02230b0774486
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -60,9 -60,9 +60,12 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #20387: Restore semantic round-trip correctness in tokenize/untokenize
+   for tab-indented blocks.
+ 
 +- Issue #24456: Fixed possible buffer over-read in adpcm2lin() and lin2adpcm()
 +  functions of the audioop module.
 +
  - Issue #24336: The contextmanager decorator now works with functions with
    keyword arguments called "func" and "self".  Patch by Martin Panter.