# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1384109401 0
# Node ID d6b3891f186cb8e4adc52d62d76ac7996f0b8c4c
# Parent  91b48772b27b768d0afd208cb0bca7ccee6542b2# Parent  081a91507e4f9a75919235daa25998d5ed9140cf
Merge 0.10->trunk

diff -r 91b48772b27b -r d6b3891f186c core/certmanager.lua
--- a/core/certmanager.lua	Sat Nov 09 18:37:13 2013 +0000
+++ b/core/certmanager.lua	Sun Nov 10 18:50:01 2013 +0000
@@ -40,7 +40,7 @@
 	options = { "no_sslv2", "no_sslv3", "cipher_server_preference", luasec_has_noticket and "no_ticket" or nil };
 	verifyext = { "lsec_continue", "lsec_ignore_purpose" };
 	curve = "secp384r1";
-	ciphers = "HIGH:!DSS:!aNULL@STRENGTH";
+	ciphers = "HIGH+kEDH:HIGH+kEECDH:HIGH+kRSA:!DSS:!3DES:!aNULL";
 }
 local path_options = { -- These we pass through resolve_path()
 	key = true, certificate = true, cafile = true, capath = true, dhparam = true
diff -r 91b48772b27b -r d6b3891f186c util/set.lua
--- a/util/set.lua	Sat Nov 09 18:37:13 2013 +0000
+++ b/util/set.lua	Sun Nov 10 18:50:01 2013 +0000
@@ -23,7 +23,7 @@
 	return _M.difference(set1, set2);
 end
 function set_mt.__div(set, func)
-	local new_set, new_items = _M.new();
+	local new_set = _M.new();
 	local items, new_items = set._items, new_set._items;
 	for item in pairs(items) do
 		local new_item = func(item);