From 0be972cbc5e541eddeebbe566e0cbbc80d198eb0 Mon Sep 17 00:00:00 2001
From: david <david@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Mon, 6 Apr 2009 15:42:58 +0000
Subject: [PATCH] Merge from /nmap-exp/david/ncat-proxy. This adds support for
 --proxy-auth in listen mode.

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

diff --git a/CHANGELOG b/CHANGELOG
index 036d0e679..7d7025687 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,10 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o Ncat can now run as an authenticated proxy in HTTP proxy mode. Use
+  the --proxy-auth option to give a username and password that will be
+  required of users of the proxy. Only the insecure Basic
+  authentication method is supported. [David]
+
 o Expanded and tweaked the product/version/info of service scans in an
   attempt to reduce the number of warnings like "Warning: Servicescan
   failed to fill info_template...".  Parts of this change include: