parse.c is auto-generated
relayd filter rewrite - This branch includes an experimental and
unfinished rewrite of the relay filter implementation.  The rewrite
includes a new filter configuration grammar and a new engine replacing
the "protocol nodes" code.  The code aims to provide a better
flexibility, grammar and gammar of the filters.  See README-filter.md
for more details.
Merge branch 'master' into filter
Merge branch 'master' into filter
Merge remote-tracking branch 'origin' into filter
Merge commit 'a05a2dc' into filter
Merge remote-tracking branch 'origin' into filter
sync with cvs
add missing http.h header
Merge branch 'master' into filter
Merge branch 'master' into filter
sync
fix htttp header/path test
hook in url lookups
sync
hook in url digests again
url, digest, cookie
push
filter example
Merge branch 'gmaster' into gfilter

Conflicts:
	relayd/parse.y
	relayd/relay_http.c
	relayd/relayd.h