Merge tag 'v9.18.33' into bind-9.18

diff --cc lib/dns/rbtdb.c
Simple merge

diff --cc lib/dns/resolver.c
Simple merge

diff --cc lib/isc/netmgr/netmgr-int.h
Simple merge