modified:   .gitignore
	deleted:    test/master/stress_1/stress
Merge branch 'master' of github.com:0x42/fire
	modified:   master/Makefile
	modified:   src/nettcp/bo_net_master.c
	modified:   src/nettcp/bo_net_master_core.c
	modified:   src/tools/dbgout.c
	modified:   src/tools/listsock.c
	modified:   src/tools/listsock.h
	modified:   test/master/stress_1/main.c