Merge remote-tracking branch 'origin/master' into flakes

src/libstore/daemon.cc

@@ -81,7 +81,7 @@ struct TunnelLogger : public Logger
         showErrorInfo(oss, ei, false);
 
         StringSink buf;
-        buf << STDERR_NEXT << oss.str() << "\n";
+        buf << STDERR_NEXT << oss.str();
         enqueueMsg(*buf.s);
     }
 

src/libutil/logging.cc

@@ -81,7 +81,6 @@ public:
 
         log(ei.level, oss.str());
     }
-    
 
     void startActivity(ActivityId act, Verbosity lvl, ActivityType type,
         const std::string & s, const Fields & fields, ActivityId parent)