Pull changes from OpenBSD as of 2013-08-22
Pull changes from OpenBSD as of 2013-10-23
Merge branch 'OpenBSD'

Conflicts:
	src/usr.sbin/relayd/parse.y
	src/usr.sbin/relayd/relay.c
	src/usr.sbin/relayd/relayd.conf.5
	src/usr.sbin/relayd/relayd.h
Fix compilation on FreeBSD 10