# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1483523596 -3600
# Node ID 0494bf73dfee61a73f2d2a3a86277555a7e9fadc
# Parent  4d182b9a810988fcb1de6531b206e3339752e9a0# Parent  caf26fc419e9c4ee99122f42e381a69911814249
Merge 0.10->trunk

diff -r 4d182b9a8109 -r 0494bf73dfee .hgtags
--- 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
diff -r 4d182b9a8109 -r 0494bf73dfee plugins/mod_net_multiplex.lua
--- 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;
 });