From: Willem Toorop <willem@nlnetlabs.nl>
Date: Wed, 2 Dec 2020 10:19:32 +0000 (+0100)
Subject: Merge branch 'master' into features/nsid
X-Git-Tag: release-1.13.1rc1~14^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb150f9655197bda9aba43b75440903bbf4c3953;p=thirdparty%2Funbound.git

Merge branch 'master' into features/nsid
---

fb150f9655197bda9aba43b75440903bbf4c3953
diff --cc doc/Changelog
index d5121864e,405060fc4..e13a560f7
--- a/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.