Merge psp-deb1.ntp.org:/home/perlinger/ntp-stable-3434

into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable

bk: 5ad1bdc42gqsUzXV75H9bzRYBSvZUw

diff --cc ChangeLog
index 823949fd2fff5734403d9c2803237e54582465b8,323c27b8af704f60d37ce77c1a89a088d898c0d3..fcc54fc4e2d5a6a98afe94ea7b696decbf48a299
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -27,8 -27,8 +27,10 @@@
    - initial patch by Hal Murray; also fixed refclock_report() trouble
  * [Bug 3456] Use uintptr_t rather than size_t to store an integer in a pointer
    - According to Brooks Davis, there was only one location <perlinger@ntp.org>
 +* [Bug 3434] ntpd clears STA_UNSYNC on start <perlinger@ntp.org>
 +  - applied patch by Miroslav Lichvar
+ * [Bug 3121] Drop root privileges for the forked DNS worker <perlinger@ntp.org>
+   - integrated patch by  Reinhard Max
  * [Bug 2821] minor build issues <perlinger@ntp.org>
    - applied patches by Christos Zoulas, including real bug fixes