Merged in a bunch of patches that I got as reaction to the 3.99 release.

See the ChangeLog for details

1 files changed, 1 insertions, 1 deletions

diff --git a/stream.c b/stream.c
index f242b63..0ddb5f1 100644
--- a/stream.c
+++ b/stream.c
@@ -78,7 +78,7 @@ int getting;
 		if (getting)
 			tprintf("maxlen=%d, ", sbp->maxlen);
 		tprintf("len=%d, buf=", sbp->len);
-		printstr(tcp, (int) sbp->buf, sbp->len);
+		printstr(tcp, (unsigned long) sbp->buf, sbp->len);
 		tprintf("}");
 	}
 }