From 0d3f794e1b3ff5fad5e58a91722c3143b77642d6 Mon Sep 17 00:00:00 2001
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Wed, 2 Mar 2016 14:51:22 +0000
Subject: Import tnftp-20150912

---
 ChangeLog | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 3705df3e23a1..0c4c8f13eb72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
-$NetBSD: ChangeLog,v 1.66 2014/11/03 21:48:49 lukem Exp $
+$NetBSD: ChangeLog,v 1.67 2015/10/04 06:20:58 lukem Exp $
 
+Sun Oct  4 06:19:25 UTC 2015	lukem
+
+	* Release as "tnftp 20151004".
+
+	* Merge NetBSD usr.bin/ftp from 20141026 to 20151003:
+		- Add  -x xferbufsize  to set xferbuf size.
+		- Add Server Name Indication (SNI) support for https.
+		- Increase buffer limit used for response handling.
 
 Mon Nov  3 21:43:20 UTC 2014	lukem
 
-- 
cgit v1.3