From ac9d18cf0fd80199c48ffa07e20291adb8107310 Mon Sep 17 00:00:00 2001
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Mon, 28 Mar 2016 16:46:33 +0000
Subject: [PATCH] Add a few changelog entries

---
 CHANGELOG | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index d7b497e35..aef08bff0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,13 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o [Zenmap] Avoid file corruption in zenmap.conf, reported as files containing
+  many null ("\x00") characters. Example exception:
+    ValueError: unable to parse colour specification
+
+o [NSE] VNC updates including vnc-brute support for TLS security type and
+  negotiating a lower RFB version if the server sends an unknown higher
+  version.  [Daniel Miller]
+
 o [NSE] Added STARTTLS support for VNC, NNTP, and LMTP [Daniel Miller]
 
 o Added new service probes and match lines for OpenVPN on UDP and TCP.