Merge 3.6, fix for #24142

diff --cc Misc/ACKS
Simple merge

diff --cc Misc/NEWS
index 385af89d73cfdd4bb5e87c4e6632e252343ff69f,c950383ce5c1b253e3f1ea25d425c6e89769916c..c18d787e67a2c2ba44d12df6e234b260c283e78d
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -409,6 -490,6 +409,9 @@@ Librar
  
  - Issue #27972: Prohibit Tasks to await on themselves.
  
++- Issue #24142: Reading a corrupt config file left configparser in an
++  invalid state.  Original patch by Florian Höch.
++
  Windows
  -------