git.ipfire.org Git - thirdparty/unbound.git/commit

]> git.ipfire.org Git - thirdparty/unbound.git/commit

projects / thirdparty / unbound.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8dae5d9 a269db3)

author	Ralph Dolmans <ralph@nlnetlabs.nl>
	Thu, 7 May 2020 15:12:26 +0000 (17:12 +0200)
committer	Ralph Dolmans <ralph@nlnetlabs.nl>
	Thu, 7 May 2020 15:12:26 +0000 (17:12 +0200)
commit	e7601870cc11f105fc6e5673d6f1b017712ef802
tree	b09294a739b0a1e56a5a6da6f95d641f6af7aeb9	tree \| snapshot
parent	8dae5d9f81a179bdbb5fdcc730df4e8875f85cd2	commit \| diff
parent	a269db3828a107fbf7601567268b41800999e427	commit \| diff

Merge branch 'master' into doh

19 files changed:

configure	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
daemon/remote.c	diff1 \|	diff2 \|	blob \| history
daemon/worker.c	diff1 \|	diff2 \|	blob \| history
doc/example.conf.in	diff1 \|	diff2 \|	blob \| history
doc/unbound.conf.5.in	diff1 \|	diff2 \|	blob \| history
services/listen_dnsport.c	diff1 \|	diff2 \|	blob \| history
services/listen_dnsport.h	diff1 \|	diff2 \|	blob \| history
services/mesh.c	diff1 \|	diff2 \|	blob \| history
testcode/fake_event.c	diff1 \|	diff2 \|	blob \| history
util/config_file.c	diff1 \|	diff2 \|	blob \| history
util/config_file.h	diff1 \|	diff2 \|	blob \| history
util/configlexer.c	diff1 \|	diff2 \|	blob \| history
util/configlexer.lex	diff1 \|	diff2 \|	blob \| history
util/configparser.c	diff1 \|	diff2 \|	blob \| history
util/configparser.h	diff1 \|	diff2 \|	blob \| history
util/configparser.y	diff1 \|	diff2 \|	blob \| history
util/net_help.c	diff1 \|	diff2 \|	blob \| history
util/netevent.c	diff1 \|	diff2 \|	blob \| history

Mirror of https://github.com/NLnetLabs/unbound.git