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: 42a35ac 4cc559d)

author	Ralph Dolmans <ralph@nlnetlabs.nl>
	Wed, 16 Sep 2020 16:38:51 +0000 (18:38 +0200)
committer	Ralph Dolmans <ralph@nlnetlabs.nl>
	Wed, 16 Sep 2020 16:38:51 +0000 (18:38 +0200)
commit	4ae823fbc23cd5a02f6333c00da1f4793b446bde
tree	c90ce87440d018a06d3ffd0d4cd4a032349508c5	tree \| snapshot
parent	42a35ac26ec902af99ed7df19656f5b4cbe594b0	commit \| diff
parent	4cc559d7eb29438b193355f7d2661cd9ca70a9f6	commit \| diff

Merge branch 'master' into doh

23 files changed:

aclocal.m4	diff1 \|	diff2 \|	blob \| history
config.h.in	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
configure.ac	diff1 \|	diff2 \|	blob \| history
daemon/remote.c	diff1 \|	diff2 \|	blob \| history
daemon/stats.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
smallapp/unbound-control.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