# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1688942077 -7200
# Node ID 1b1ed555f307c4dd48b3a50200ab40f82d7364fa
# Parent  0d1cd3185299d20be1ba0c3bc71aa540980ba46d# Parent  e689d4c456812c74c6f910ae7b133a0a9e14c63a
Merge 0.12->trunk

diff -r 0d1cd3185299 -r 1b1ed555f307 core/certmanager.lua
--- a/core/certmanager.lua	Sun Jul 02 14:31:00 2023 +0200
+++ b/core/certmanager.lua	Mon Jul 10 00:34:37 2023 +0200
@@ -215,7 +215,7 @@
 
 local mozilla_ssl_configs = {
 	-- https://wiki.mozilla.org/Security/Server_Side_TLS
-	-- Version 5.6 as of 2021-12-26
+	-- Version 5.7 as of 2023-07-09
 	modern = {
 		protocol = "tlsv1_3";
 		options = { cipher_server_preference = false };
@@ -236,6 +236,7 @@
 			"ECDHE-RSA-CHACHA20-POLY1305";
 			"DHE-RSA-AES128-GCM-SHA256";
 			"DHE-RSA-AES256-GCM-SHA384";
+			"DHE-RSA-CHACHA20-POLY1305";
 		};
 		curveslist = { "X25519"; "prime256v1"; "secp384r1" };
 		ciphersuites = { "TLS_AES_128_GCM_SHA256"; "TLS_AES_256_GCM_SHA384"; "TLS_CHACHA20_POLY1305_SHA256" };
diff -r 0d1cd3185299 -r 1b1ed555f307 plugins/mod_pubsub/pubsub.lib.lua
--- a/plugins/mod_pubsub/pubsub.lib.lua	Sun Jul 02 14:31:00 2023 +0200
+++ b/plugins/mod_pubsub/pubsub.lib.lua	Mon Jul 10 00:34:37 2023 +0200
@@ -320,7 +320,7 @@
 	end
 
 	for _, id in ipairs(ret) do
-		reply:tag("item", { jid = service.jid or module.host, name = id }):up();
+		reply:tag("item", { jid = service.config.jid or module.host, name = id }):up();
 	end
 	event.exists = true;
 end