Merge branch 'obsd-master'

Conflicts:
	tmux.1
	window.c

1 files changed, 4 insertions, 1 deletions

diff --git a/server.c b/server.c
index bdbe9223..72395119 100644
--- a/server.c
+++ b/server.c
@@ -150,7 +150,7 @@ server_start(struct event_base *base, int lockfd, char *lockfile)
 	}
 	close(pair[0]);
 
-	if (log_get_level() > 3)
+	if (log_get_level() > 1)
 		tty_create_log();
 	if (pledge("stdio rpath wpath cpath fattr unix getpw recvfd proc exec "
 	    "tty ps", NULL) != 0)
@@ -364,6 +364,9 @@ server_signal(int sig)
 		}
 		server_add_accept(0);
 		break;
+	case SIGUSR2:
+		proc_toggle_log(server_proc);
+		break;
 	}
 }