Use correct logic
Merge remote-tracking branch 'origin/master' into tcp_fastopen
Merge remote-tracking branch 'lkarsten/tcp_fastopen' into tcp_fastopen

Conflicts:
	configure.ac