sync snmpd
sync
sync
Merge branch 'gmaster' into gfilter

Conflicts:
	relayd/parse.y
	relayd/relay_http.c
	relayd/relayd.h
dead symbol
sync
ignore local diffs
ignore local diffs
sync
Merge branch 'github master' into gfilter
sync
sync
Add regress tests
sync
sync
Merge branch 'gmaster' into gfilter
update regress tests
sync
update regress tests
sort entries, fix typo