# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1383248877 -3600
# Node ID 019130907a07cd72f6fec0813810d4ce3006fae2
# Parent  9e47ece9457c8274c7ea82b13ec9bee9b54d38fb# Parent  1b0ac79501290817b90872d9fbd9a054b605e8e5
Merge 0.9 -> 0.10

diff -r 9e47ece9457c -r 019130907a07 core/certmanager.lua
--- a/core/certmanager.lua	Thu Oct 31 00:53:59 2013 +0100
+++ b/core/certmanager.lua	Thu Oct 31 20:47:57 2013 +0100
@@ -37,7 +37,7 @@
 	capath = "/etc/ssl/certs";
 	protocol = "sslv23";
 	verify = (ssl and ssl.x509 and { "peer", "client_once", }) or "none";
-	options = { "no_sslv2", luasec_has_noticket and "no_ticket" or nil };
+	options = { "no_sslv2", "no_sslv3", luasec_has_noticket and "no_ticket" or nil };
 	verifyext = { "lsec_continue", "lsec_ignore_purpose" };
 	curve = "secp384r1";
 	ciphers = "HIGH:!DSS:!aNULL@STRENGTH";