sync
sync
sync
Merge branch 'gmaster' into gfilter

Conflicts:
	relayd/parse.y
	relayd/relay_http.c
	relayd/relayd.h
dead symbol
sync