merge

diff --cc Misc/NEWS
index 5d68a94722680f9c815ae559ff0a46f2cb4c221e,712b982f85f7d31d1b6a07954e6564e668577a48..6c93caf354b2bbba5feed6d0b28991f65cc4a030
--- 1/Misc/NEWS
--- 2/Misc/NEWS
+++ b/Misc/NEWS
@@@ -27,6 -27,6 +27,12 @@@ Core and Builtin
  Library
  -------
  
++- Issue #23600: Default implementation of tzinfo.fromutc() was returning
++  wrong results in some cases.
++
++- Issue #25203: Failed readline.set_completer_delims() no longer left the
++  module in inconsistent state.
++
  - Issue #25011: rlcomplete now omits private and special attribute names unless
    the prefix starts with underscores.