Mercurial > prosody-hg

changeset 7808:0494bf73dfee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 04 Jan 2017 10:53:16 +0100
parents 4d182b9a8109 (current diff) caf26fc419e9 (diff)
children cdb5dd9f35c0
files
diffstat 2 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Jan 02 03:06:51 2017 +0100
+++ b/.hgtags	Wed Jan 04 10:53:16 2017 +0100
@@ -59,3 +59,4 @@
 7ec52755622f1009aaf7b02fc9bc91e8ad9974be 0.9.9
 352270bc04393910a567b569ede03358dbb728b5 0.9.10
 8613086779fa9276615c2af066d2a10c38d0c86e 0.9.11
+2a7b52437167a5c7b6c8a5bc79f4463afe092fd5 0.9.12
--- a/plugins/mod_net_multiplex.lua	Mon Jan 02 03:06:51 2017 +0100
+++ b/plugins/mod_net_multiplex.lua	Wed Jan 04 10:53:16 2017 +0100
@@ -67,5 +67,6 @@
 module:provides("net", {
 	name = "multiplex_ssl";
 	config_prefix = "ssl";
+	encryption = "ssl";
 	listener = listener;
 });