Merge branch 'master' into dnsdist-reload-all-certs

diff --cc pdns/dnsdist-console.cc
Simple merge

diff --cc pdns/dnsdist-lua.cc
Simple merge

diff --cc pdns/dnsdistdist/docs/reference/config.rst
index 6a366f1982416ab315a82f3e6c52c2baac4b7d02,ef1f68b4b1ccb89766b216ff96a2dab34975bc44..2e0355283d65ff0da9986f1c4e869b7e2e825ebe
--- 1/pdns/dnsdistdist/docs/reference/config.rst
--- 2/pdns/dnsdistdist/docs/reference/config.rst
+++ b/pdns/dnsdistdist/docs/reference/config.rst
@@@ -42,12 -42,14 +42,20 @@@ Global configuratio
  
    :param str path: The directory to load configuration files from. Each file must end in ``.conf``.
  
 +.. function:: reloadAllCertificates()
 +
 +  .. versionadded:: 1.4.0
 +
 +  Reload all DNSCrypt and TLS certificates, along with their associated keys.
 +
+ .. function:: setSyslogFacility(facility)
+ 
+   .. versionadded:: 1.4.0
+ 
+   Set the syslog logging facility to ``facility``.
+ 
+   :param int facility: The new facility as a numeric value. Defaults to LOG_DAEMON.
+ 
  Listen Sockets
  ~~~~~~~~~~~~~~