Merge 0.9->0.10

diff --cc plugins/mod_tls.lua
index bab2202ea7eb01b0216944e40aa2359ca6a9a07c,2741b8d401f04a1ebee22a66a543b96ae3cb058a..7c3d79be069bb87ad8bf2c5864e2b1bc08433e8d
--- 1/plugins/mod_tls.lua
--- 2/plugins/mod_tls.lua
+++ b/plugins/mod_tls.lua
@@@ -20,9 -26,11 +26,9 @@@ local starttls_proceed = st.stanza("pro
  local starttls_failure = st.stanza("failure", starttls_attr);
  local c2s_feature = st.stanza("starttls", starttls_attr);
  local s2s_feature = st.stanza("starttls", starttls_attr);
- if secure_auth_only then c2s_feature:tag("required"):up(); end
- if secure_s2s_only then s2s_feature:tag("required"):up(); end
+ if c2s_require_encryption then c2s_feature:tag("required"):up(); end
+ if s2s_require_encryption then s2s_feature:tag("required"):up(); end
  
 -local global_ssl_ctx = prosody.global_ssl_ctx;
 -
  local hosts = prosody.hosts;
  local host = hosts[module.host];
  

diff --cc tools/ejabberd2prosody.lua
Simple merge

diff --cc tools/ejabberdsql2prosody.lua
Simple merge