fixed the compounding buffer issue
Merge remote-tracking branch 'origin/master'

Conflicts:
	tcp_module.cc