Merge remote-tracking branch 'ahuremote/master'

Conflicts:
	pdns/dnsdistdist/populate

diff --cc pdns/Makefile.am
Simple merge

diff --cc pdns/dnsdistdist/Makefile.am
Simple merge

diff --cc pdns/dnsdistdist/populate
index 21d098f4d6972e231e2f1fd849cc1765f109d6b2,19f881879af9afeebf0f353303867846ab3bc9f0..12f9a1eb075ee5dab3953522cce42a69a84a2da4
--- 1/pdns/dnsdistdist/populate
--- 2/pdns/dnsdistdist/populate
+++ b/pdns/dnsdistdist/populate
@@@ -3,14 -3,13 +3,15 @@@
  set -e
  set -x
  
 -ln -fs ../base32.hh ../base64.hh ../dnsdist.cc ../dnsdist.hh ../dnsdist-lua.cc ../dns.hh \
 -../dnslabeltext.rl ../dnsname.cc ../dnsname.hh ../dnsparser.hh ../dnsrulactions.hh ../dnswriter.cc ../dnswriter.hh \
 -../dolog.hh ../iputils.cc ../iputils.hh ../misc.cc ../misc.hh ../namespaces.hh \
 -../pdnsexception.hh ../qtype.cc ../qtype.hh ../sholder.hh ../sodcrypto.cc ../sodcrypto.hh \
 -../dnsdist-web.cc ../sstuff.hh ../dnsdist-tcp.cc ../dnsdist-carbon.cc .
 +ln -fs ../base32.hh ../base64.hh ../dnsdist.cc ../dnsdist.hh ../dnsdist-lua.cc \
 +  ../dns.hh ../dnslabeltext.rl ../dnsname.cc ../dnsname.hh ../dnsparser.hh \
 +  ../dnsrulactions.hh ../dnswriter.cc ../dnswriter.hh ../dolog.hh \
 +  ../iputils.cc ../iputils.hh ../misc.cc ../misc.hh ../namespaces.hh \
 +  ../pdnsexception.hh ../qtype.cc ../qtype.hh ../sholder.hh ../sodcrypto.cc \
-   ../sodcrypto.hh ../dnsdist-web.cc ../sstuff.hh ../dnsdist-tcp.cc .
++  ../sodcrypto.hh ../dnsdist-web.cc ../sstuff.hh ../dnsdist-tcp.cc \
++  ../dnsdist-carbon.cc .
  
 -mkdir m4
 +mkdir -p m4
  ln -fs ../../../m4/pdns_check_libsodium.m4 m4/
  ln -fs ../../../m4/pdns_check_readline.m4 m4/
  ln -fs ../../../m4/ax_lib_readline.m4 m4/