K 10
svn:author
V 7
roberto
K 8
svn:date
V 27
2004-07-20T15:18:31.000000Z
K 7
svn:log
V 222
Merge conflicts (see also previous commit).

Reinsert our local changes to ntp_control.c:

1.4:    Do not log every potential exploit attempt since a denial-of-service
        may result
1.5:    int -> unsigned char fixes

END