Merge branch 'master' into rec-warnings

diff --cc pdns/lwres.cc
index 6a7bd7344591ff4aa27774745155a510368f5532,ca578ce6a562d94270489d518eb13af51a13d539..7bec6f8ae47c0d8e439364463fbf6bb6a1f6b870
--- 1/pdns/lwres.cc
--- 2/pdns/lwres.cc
+++ b/pdns/lwres.cc
@@@ -296,9 -296,10 +296,11 @@@ LWResult::Result asyncresolve(const Com
  
    // We only store the localip if needed for fstrm logging
    ComboAddress localip;
 -  bool fstrmQEnabled = false;
 -  bool fstrmREnabled = false;
+   bool dnsOverTLS = false;
  #ifdef HAVE_FSTRM
 +  bool fstrmQEnabled = false;
 +  bool fstrmREnabled = false;
++  
    if (isEnabledForQueries(fstrmLoggers)) {
      fstrmQEnabled = true;
    }