From 1ea9bc448051998724b55eac569244a89caaef34 Mon Sep 17 00:00:00 2001
From: colin <colin@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Tue, 16 Aug 2011 02:10:56 +0000
Subject: [PATCH] Updated Changelog for r25754 and r25826

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

diff --git a/CHANGELOG b/CHANGELOG
index e86909e66..cc5dda2bd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,12 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o [Zenmap] Fixed zenmap deleting ports based on newer scans which did
+  not actually scan the port in question. Additionally ncat now only
+  updates ports with new information if the new information is the same
+  protocol. Not just the same port. [Colin Rice]
+
+o [Ncat] Fixed ncat crashing with --ssl-verify -vvv on windows. [Colin Rice]
+
 o [NSE] Added script http-waf-detect. This script tries to determine
   if an IDS/IPS/WAF is protecting a web server. [Paulino]