Merge branch 'obsd-master'

Conflicts:
	tmux.1
	window.c

1 files changed, 6 insertions, 0 deletions

diff --git a/proc.c b/proc.c
index 48890809..dabf462f 100644
--- a/proc.c
+++ b/proc.c
@@ -263,3 +263,9 @@ proc_kill_peer(struct tmuxpeer *peer)
 {
 	peer->flags |= PEER_BAD;
 }
+
+void
+proc_toggle_log(struct tmuxproc *tp)
+{
+	log_toggle(tp->name);
+}