Merge 0.9->0.10

1 files changed, 0 insertions, 6 deletions

diff --git a/prosody b/prosody
index ee2baca5..b411370f 100755
--- a/prosody
+++ b/prosody
@@ -265,12 +265,6 @@ function init_global_state()
 		prosody.events.fire_event("server-stopping", {reason = reason});
 		server.setquitting(true);
 	end
-
-	-- Load SSL settings from config, and create a ctx table
-	local certmanager = require "core.certmanager";
-	local global_ssl_ctx = certmanager.create_context("*", "server");
-	prosody.global_ssl_ctx = global_ssl_ctx;
-
 end
 
 function read_version()