# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1381826891 -7200
# Node ID e4150e6720f7da764aad41ee84d4a7f2b3c3cc50
# Parent  4669bd7038c7fda7178cbff46b2933388d12fe67# Parent  3321a4b3e6c4a19c59a1e17dc46124a00aa70525
Merge 0.10->trunk

diff -r 4669bd7038c7 -r e4150e6720f7 core/certmanager.lua
--- a/core/certmanager.lua	Tue Oct 15 01:38:02 2013 +0200
+++ b/core/certmanager.lua	Tue Oct 15 10:48:11 2013 +0200
@@ -54,8 +54,8 @@
 end
 
 if luasec_has_no_compression then -- Has no_compression? Then it has these too...
-	default_options[#default_options+1] = "single_dh_use";
-	default_options[#default_options+1] = "single_ecdh_use";
+	core_defaults.options[#core_defaults.options+1] = "single_dh_use";
+	core_defaults.options[#core_defaults.options+1] = "single_ecdh_use";
 	if configmanager.get("*", "ssl_compression") ~= true then
 		core_defaults.options[#core_defaults.options+1] = "no_compression";
 	end