From 3c96cdca6cc7e3ce36ffffbe3b0acd0da10a930e Mon Sep 17 00:00:00 2001
From: Brent Cook <bcook@openbsd.org>
Date: Mon, 30 May 2016 17:47:40 -0500
Subject: [PATCH] update changelog

---
 ChangeLog | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index f022174..7b9c64f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,17 @@
 For detailed changes, see the changes either in the OpenBSD CVS repository or
 the GitHub mirror.
 
+2016-05-30  OpenNTPD 6.0p1
+
+	* Fixed a link failure on older Linux distributions and a build
+	  failure on FreeBSD.
+	* Set MOD_MAXERROR to avoid unsynced time status when using
+	  ntp_adjtime.
+	* Fixed HTTP Timestamp header parsing to use strptime in a more
+	  portable fashion.
+	* Hardened TLS for ntpd constraints, enabling server name
+	  verification. Thanks to Luis M. Merino.
+
 2016-03-29  OpenNTPD 5.9p1
 
 	* When a single "constraint" is specified, try all returned addresses