# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1370983841 -3600
# Node ID ebdbf4cf0b2f766f8edf4fe8ee628b60f89b7c29
# Parent  9345c161481fbe16150c7468f3942722dab7bb5b# Parent  9ca4d1ada906b5022e3f26c966c1ef69736f2706
Merge 0.9->trunk

diff -r 9345c161481f -r ebdbf4cf0b2f core/certmanager.lua
--- a/core/certmanager.lua	Tue Jun 11 21:36:15 2013 +0200
+++ b/core/certmanager.lua	Tue Jun 11 21:50:41 2013 +0100
@@ -64,6 +64,8 @@
 		verifyext = user_ssl_config.verifyext or default_verifyext;
 		options = user_ssl_config.options or default_options;
 		depth = user_ssl_config.depth;
+		curve = user_ssl_config.curve;
+		dhparam = user_ssl_config.dhparam;
 	};
 
 	local ctx, err = ssl_newcontext(ssl_config);
diff -r 9345c161481f -r ebdbf4cf0b2f plugins/mod_admin_telnet.lua
diff -r 9345c161481f -r ebdbf4cf0b2f plugins/mod_bosh.lua