Merge psp-deb2.ntp.org:/home/stenn/ntp-stable

into  psp-deb2.ntp.org:/home/stenn/ntp-stable-3592

bk: 5e105b6dBM7bRalU1njqqskqhesWdQ

diff --cc ChangeLog
index 8a033319bd9982ca50bb340d929d9a3485aed446,f3816a92d6beedfcf9c73bea893343970bf1c6d7..2b3ea9946d34cda9c47f5a650c105adf495720e8
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,8 +1,10 @@@
  ---
  
- * [Sec 3610] process_control() should bail earlier on short packets. stenn@
-   - Reported by Philippe Antoine
 +* [Sec 3592] DoS attack on client ntpd <perlinger@ntp.org>
 +  - Reported by Miroslav Lichvar
+ * [Sec 3610] process_control() should bail earlier on short packets. stenn@
+   - Reported by Philippe Antoine
+ * [Bug 3634] Typo in discipline.html, reported by Jason Harrison.  stenn@
  * [Bug 3620] memory leak in ntpq sysinfo <perlinger@ntp.org>
    - applied patch by Gerry Garvey
  * [Bug 3619] Honour drefid setting in cooked mode and sysinfo <perlinger@ntp.org>