Merge branch 'edge' of http://10.6.6.2/zerotier/ZeroTierOne into edge

netcon/README.md

@@ -161,12 +161,18 @@ To run unit tests:
     mkdir -p /tmp/netcon_first
     cp -f ./netcon/liblwip.so /tmp/netcon_first
     ./zerotier-netcon-service -d -p8100 /tmp/netcon_first
+    while [ ! -f /tmp/netcon_first/identity.secret ]; do
+      sleep 0.1
+    done
     ./zerotier-cli -D/tmp/netcon_first join 8056c2e21c000001
     kill `cat /tmp/netcon_first/zerotier-one.pid`
 
     mkdir -p /tmp/netcon_second
     cp -f ./netcon/liblwip.so /tmp/netcon_second
     ./zerotier-netcon-service -d -p8101 /tmp/netcon_second
+    while [ ! -f /tmp/netcon_second/identity.secret ]; do
+      sleep 0.1
+    done
     ./zerotier-cli -D/tmp/netcon_second join 8056c2e21c000001
     kill `cat /tmp/netcon_second/zerotier-one.pid`