Merge 0.9->0.10

This commit is contained in:
Kim Alvefur 2017-01-04 10:53:12 +01:00
commit f5f1dd31ef

View file

@ -67,5 +67,6 @@ module:provides("net", {
module:provides("net", {
name = "multiplex_ssl";
config_prefix = "ssl";
encryption = "ssl";
listener = listener;
});