# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1371078596 -3600
# Node ID 9afc94c4346eb5fc0b32fe8d3949eb38ce079181
# Parent  ebdbf4cf0b2f766f8edf4fe8ee628b60f89b7c29# Parent  c1021a2e7071c3bc6933921671aa08bcdef3ccad
Merge 0.9->trunk

diff -r ebdbf4cf0b2f -r 9afc94c4346e core/certmanager.lua
--- a/core/certmanager.lua	Tue Jun 11 21:50:41 2013 +0100
+++ b/core/certmanager.lua	Thu Jun 13 00:09:56 2013 +0100
@@ -64,7 +64,7 @@
 		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;
+		curve = user_ssl_config.curve or "secp384r1";
 		dhparam = user_ssl_config.dhparam;
 	};
 
diff -r ebdbf4cf0b2f -r 9afc94c4346e util/pubsub.lua
--- a/util/pubsub.lua	Tue Jun 11 21:50:41 2013 +0100
+++ b/util/pubsub.lua	Thu Jun 13 00:09:56 2013 +0100
@@ -233,6 +233,9 @@
 	end
 	--
 	local node_obj = self.nodes[node];
+	if not node_obj then
+		return false, "item-not-found";
+	end
 	self.nodes[node] = nil;
 	self.config.broadcaster("delete", node, node_obj.subscribers);
 	return true;