From a26f7655467940670ae467ed8168569c132087a6 Mon Sep 17 00:00:00 2001
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Tue, 22 Mar 2016 03:40:44 +0000
Subject: [PATCH] Add a few changelog entries

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

diff --git a/CHANGELOG b/CHANGELOG
index cd772da89..926676c2f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,19 @@ o [NSE] Added support in sslcert.lua for Microsoft SQL Server's TDS protocol,
   so you can now grab certs with ssl-cert or check ciphers with
   ssl-enum-ciphers.  [Daniel Miller]
 
+o [Zenmap] Fix a crash when setting default window geometry:
+    TypeError: argument of type 'int' is not iterable
+
+o [Zenmap] Fix a crash when displaying the date from an Nmap XML file due to an
+  empty or unknown locale:
+    File "zenmapCore/NmapParser.py", line 627, in get_formatted_date
+      locale.getpreferredencoding())
+    LookupError: unknown encoding:
+
+o [Zenmap] Fix a crash due to incorrect file paths when installing to
+  /usr/local prefix. Example:
+    Exception: File '/home/blah/.zenmap/scan_profile.usp' does not exist or could not be found!
+
 Nmap 7.10 [2016-03-17]
 
 o [NSE] Added 12 NSE scripts from 7 authors, bringing the total up to 527!