# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1452522798 -3600
# Node ID ec17115e3721a7dfb7526b5d395a93dc44802e7b
# Parent  31fa6770019c5d6e022203fce8b1f5361bee8f04# Parent  0386ccf20ac734b0bbe2f1cdae89367400a5369b
Merge 0.9->0.10

diff -r 31fa6770019c -r ec17115e3721 core/portmanager.lua
--- a/core/portmanager.lua	Sun Jan 10 03:35:00 2016 +0100
+++ b/core/portmanager.lua	Mon Jan 11 15:33:18 2016 +0100
@@ -29,7 +29,7 @@
 	table.insert(default_local_interfaces, "::1");
 end
 
-local default_mode = config.get("*", "network_default_read_size") or 4096;
+local default_mode = config.get("*", "network_default_read_size") or "*a";
 
 --- Private state
 
diff -r 31fa6770019c -r ec17115e3721 util/uuid.lua