Merge branch 'obsd-master'

Conflicts:
	Makefile
	tmux.1
	window.c

client.c

@@ -25,8 +25,6 @@
 
 #include <errno.h>
 #include <event.h>
-#include <fcntl.h>
-#include <pwd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>