Added -t timeout option to -l option on mactelnet.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	mactelnet.c