# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1459023479 0
# Node ID 3849b5187d475cdb30de241ea4fc83067c99f504
# Parent  1fa6052f3a0703b1390b4db51af5bafe9c26da56# Parent  afa83f3ccaadbd774bcfdc843cb033d3546e474a
Merge 0.10->trunk

diff -r 1fa6052f3a07 -r 3849b5187d47 core/certmanager.lua
--- a/core/certmanager.lua	Sat Mar 26 14:54:39 2016 +0100
+++ b/core/certmanager.lua	Sat Mar 26 20:17:59 2016 +0000
@@ -36,7 +36,7 @@
 local config_path = prosody.paths.config;
 
 local luasec_major, luasec_minor = ssl._VERSION:match("^(%d+)%.(%d+)");
-local luasec_version = luasec_major * 100 + luasec_minor;
+local luasec_version = tonumber(luasec_major) * 100 + tonumber(luasec_minor);
 local luasec_has = {
 	-- TODO If LuaSec ever starts exposing these things itself, use that instead
 	cipher_server_preference = luasec_version >= 2;