Merge 0.10->trunk

diff --combined plugins/mod_s2s/mod_s2s.lua
index 597aec6c96adcb840d0eea0d92979ce41e1a6031,2fda63ceb1d60ea7da59e6cb9884592d04b0b01e..a199d0ac76ea459c384053802f87142ad71ebcb7
--- 1/plugins/mod_s2s/mod_s2s.lua
--- 2/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@@ -56,9 -56,6 +56,9 @@@ local function bounce_sendq(session, re
                        (session.log or log)("error", "Replying to to an s2s error reply, please report this! Traceback: %s", traceback());
                end;
                dummy = true;
 +              close = function ()
 +                      (session.log or log)("error", "Attempting to close the dummy origin of s2s error replies, please report this! Traceback: %s", traceback());
 +              end;
        };
        for i, data in ipairs(sendq) do
                local reply = data[2];
@@@ -352,6 -349,7 +352,7 @@@ function stream_callbacks.streamopened(
                                hosts[to].events.fire_event("s2s-stream-features", { origin = session, features = features });
                        else
                                (session.log or log)("warn", "No 'to' on stream header from %s means we can't offer any features", from or session.ip or "unknown host");
+                               fire_global_event("s2s-stream-features-legacy", { origin = session, features = features });
                        end
  
                        if ( session.type == "s2sin" or session.type == "s2sout" ) or features.tags[1] then