Wrap up some DoH flags am: 75bef416 am: 21d21516 am: 18f24178

mentioned in commit 083e03d3

mentioned in commit 4e038747

mentioned in commit f6031dca

mentioned in commit 920c8124

mentioned in commit 008bc9fc

mentioned in commit d39921fe

mentioned in commit c394b95a

mentioned in commit 84e00573

mentioned in commit 381f0337

mentioned in commit f6e04849

mentioned in commit ec4841d4

mentioned in commit 4da15abf

mentioned in commit d97ed82d