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: 8af1764 fca884a)

author	Willem Toorop <willem@nlnetlabs.nl>
	Fri, 9 Oct 2020 17:26:01 +0000 (19:26 +0200)
committer	Willem Toorop <willem@nlnetlabs.nl>
	Fri, 9 Oct 2020 17:26:01 +0000 (19:26 +0200)
commit	0040a41b33b87de59ab4d35c9882f908af338542
tree	81f220d901080c090602caa903b8b2601eb6e935	tree
parent	8af1764a472f6384d953a8f0d7525133dfd1e6dc	commit \| diff
parent	fca884a7e639c34b9e29de41aa9fe9d8ba45708d	commit \| diff

Merge branch 'master' into features/cookies-and-padding

20 files changed:

Makefile.in	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
daemon/acl_list.c	diff1 \|	diff2 \|	blob \| history
daemon/worker.c	diff1 \|	diff2 \|	blob \| history
doc/unbound.conf.5.in	diff1 \|	diff2 \|	blob \| history
ltmain.sh	diff1 \|	diff2 \|	blob \| history
services/mesh.c	diff1 \|	diff2 \|	blob \| history
services/outside_network.c	diff1 \|	diff2 \|	blob \| history
sldns/rrdef.h	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/edns.c	diff1 \|	diff2 \|	blob \| history
util/edns.h	diff1 \|	diff2 \|	blob \| history
util/net_help.c	diff1 \|	diff2 \|	blob \| history
util/net_help.h	diff1 \|	diff2 \|	blob \| history

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