Merge branch 'master' into features/nsid

diff --cc doc/Changelog
index d5121864ed19c31980f849cadc5e46974047b9b9,405060fc4b0384d6d7dc6017f6ba50ec2f9e6b5f..e13a560f7cb82050a594b11c96e0827048215d3c
--- 1/doc/Changelog
--- 2/doc/Changelog
+++ b/doc/Changelog
@@@ -1,7 -1,9 +1,13 @@@
 +2 December 2020: Willem
 +      - Support for RFC5001: DNS Name Server Identifier (NSID) Option
 +        with the nsid: option in unbound.conf
 +
+ 2 December 2020: Wouter
+       - Fix #360: for the additionally reported TCP Fast Open makes TCP
+         connections fail, in that case we print a hint that this is
+         happening with the error in the logs.
+       - Fix #356: deadlock when listening tcp.
+ 
  1 December 2020: Wouter
        - Fix #358: Squelch udp connect 'no route to host' errors on low
          verbosity.