Updated ChangeLog
Merge branch 'master' of https://github.com/downwa/tcprelay

Conflicts:
	ChangeLog