# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1485516199 -3600
# Node ID a858066faac6dbc130b446185c48e420c530ecac
# Parent  11fcdef5022f0dc9e8734f06d7ea0cf7089d38e4# Parent  eb5fba4c80740ae88debf1e4028af6926bc8530f
Merge 0.10->trunk

diff -r 11fcdef5022f -r a858066faac6 plugins/mod_tls.lua
--- a/plugins/mod_tls.lua	Thu Jan 26 19:47:33 2017 +0100
+++ b/plugins/mod_tls.lua	Fri Jan 27 12:23:19 2017 +0100
@@ -62,10 +62,10 @@
 end
 
 local function can_do_tls(session)
-	if session.ssl_ctx ~= nil then
+	if not session.conn.starttls then
+		return false;
+	elseif session.ssl_ctx ~= nil then
 		return session.ssl_ctx;
-	elseif not session.conn.starttls then
-		return false;
 	end
 	if session.type == "c2s_unauthed" then
 		session.ssl_ctx = ssl_ctx_c2s;