merge of 00b67a11e33c3ed390556805ed6d1078528bee70
     and a3e68842a71eaba22c23468ff95fded952acb973

--HG--
extra : convert_revision : 51e1bd8be97b4591773adef1b4955f60100f09dd
diff --git a/CHANGES b/CHANGES
index e04c028..01ca4bf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,41 @@
+0.44test3 - Fri Aug 27 22:20:54 +0800
+
+- Fixed a bunch of warnings.
+
+- scp works correctly when passed a username (fix for the dbclient program
+  itself as well, "-lmatt" works as well as "-l matt").
+
+- Remove unrequired debian files
+
+- Exit with the remote process's return code for dbclient
+
+- Display stderr messages from the server in the client
+
+- Add circular buffering to the channel code. This should dramatically reduce
+  the amount of backtraffic sent in response to traffic incoming to the
+  Dropbear end - improves high-latency performance (ie dialup).
+
+- Various other related channel-handling fixups.
+
+- Allow leading lines in the banner when connecting to servers
+
+- Fixed printing out errors onto the network socket with stderr (for inetd
+  mode when using xinetd)
+
+- Remove obselete documentation
+
+- Fix a null-pointer exception when trying to free non-existant listeners
+  at cleanup.
+
+- DEBUG_TRACE now only works if you add "-v" to the program commandline
+
+- Don't leave stdin non-blocking on exit - this caused the parent shell
+  of dbclient to close when dbclient exited, for some shells in BusyBox
+
+- Server connections no longer timeout after 5 minutes
+
+- Fixed stupid DSS hostkey typo (server couldn't load host keys)
+
 0.44test2 - Tues Aug 17 2004 17:43:54 +0800
 
 - Fix up dropbearmulti targets in the Makefile - symlinks are now created
diff --git a/TODO b/TODO
index 4ac3757..dac9a04 100644
--- a/TODO
+++ b/TODO
@@ -2,10 +2,6 @@
 
 Things which might need doing:
 
-- exit with returned exit codes?
-
-- errfd needs fixing
-
 - Make options.h generated from configure perhaps?
 
 - Improved queueing of unauthed connections
@@ -14,8 +10,6 @@
 
 - handle /etc/environment in AIX
 
-- improve channel window adjustment algorithm (circular buffering)
-
 - check that there aren't timing issues with valid/invalid user authentication
   feedback.
 
diff --git a/debian/changelog b/debian/changelog
index 41ca58c..c728227 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dropbear (0.44test3-1) unstable; urgency=medium
+
+  * New upstream beta, various useful fixes.
+
+ -- Matt Johnston <matt@ucc.asn.au>  Fri, 27 August 2004 22:20:00 +0800
+
 dropbear (0.44test2-1) unstable; urgency=low
 
   * New upstream beta, various minor fixes.
diff --git a/options.h b/options.h
index 2f53831..4379358 100644
--- a/options.h
+++ b/options.h
@@ -173,7 +173,7 @@
  *******************************************************************/
 
 #ifndef DROPBEAR_VERSION
-#define DROPBEAR_VERSION "0.44test2"
+#define DROPBEAR_VERSION "0.44test3"
 #endif
 
 #define LOCAL_IDENT "SSH-2.0-dropbear_" DROPBEAR_VERSION