Merge 0.10->trunk

diff --cc plugins/mod_c2s.lua
index a690e9be7f112931f5f77680d21c77de482b0884,e69bf461d2e3637219339dbaacd40ea577668cc2..703c4ac7ab4054f49c3eb10683fe55acb62c2e36
--- 1/plugins/mod_c2s.lua
--- 2/plugins/mod_c2s.lua
+++ b/plugins/mod_c2s.lua
@@@ -36,8 -35,17 +36,18 @@@ local hosts = prosody.hosts
  
  local stream_callbacks = { default_ns = "jabber:client" };
  local listener = {};
 +local runner_callbacks = {};
  
+ do
+       -- Connection counter resets to 0 on load and reload
+       -- Bump it up to current value
+       local count = 0;
+       for _ in pairs(sessions) do
+               count = count + 1;
+       end
+       measure_connections(count);
+ end
+ 
  --- Stream events handlers
  local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
  

diff --cc plugins/mod_s2s/mod_s2s.lua
index c0eaea01216b1e68beb9d83684371b785c08e25d,ea186cf0f265f48d5e1d5139b21679a42bcc1281..fe674b55d961b7755d808fee9f68733be2dc2e5d
--- 1/plugins/mod_s2s/mod_s2s.lua
--- 2/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@@ -42,10 -41,18 +42,20 @@@ local measure_connections = module:meas
  
  local sessions = module:shared("sessions");
  
 +local runner_callbacks = {};
 +
  local log = module._log;
  
+ do
+       -- Connection counter resets to 0 on load and reload
+       -- Bump it up to current value
+       local count = 0;
+       for _ in pairs(sessions) do
+               count = count + 1;
+       end
+       measure_connections(count);
+ end
+ 
  --- Handle stanzas to remote domains
  
  local bouncy_stanzas = { message = true, presence = true, iq = true };