# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1504013093 -7200
# Node ID a7863f4aae65884a522123eba5849b5cb5a1d5f4
# Parent  a0ad62a269dfe0eafa37ad5fee3fdc780151f975# Parent  85a60e8635091cb2f9bf78eaea105eba9073f92f
Merge 0.10->trunk

diff -r a0ad62a269df -r a7863f4aae65 prosody
--- a/prosody	Mon Aug 28 21:05:12 2017 +0200
+++ b/prosody	Tue Aug 29 15:24:53 2017 +0200
@@ -322,7 +322,7 @@
 	end});
 
 	local http = require "net.http"
-	local config_ssl = config.get("*", "ssl")
+	local config_ssl = config.get("*", "ssl") or {}
 	local https_client = config.get("*", "client_https_ssl")
 	http.default.options.sslctx = require "core.certmanager".create_context("client_https port 0", "client",
 		{ capath = config_ssl.capath, cafile = config_ssl.cafile, verify = "peer", }, https_client);
diff -r a0ad62a269df -r a7863f4aae65 prosodyctl
--- a/prosodyctl	Mon Aug 28 21:05:12 2017 +0200
+++ b/prosodyctl	Tue Aug 29 15:24:53 2017 +0200
@@ -251,7 +251,7 @@
 local socket = require "socket"
 
 local http = require "net.http"
-local config_ssl = config.get("*", "ssl")
+local config_ssl = config.get("*", "ssl") or {}
 local https_client = config.get("*", "client_https_ssl")
 http.default.options.sslctx = require "core.certmanager".create_context("client_https port 0", "client",
 	{ capath = config_ssl.capath, cafile = config_ssl.cafile, verify = "peer", }, https_client);