Merge branch 'obsd-master'

Conflicts:
	log.c
	proc.c
	tmux.c

1 files changed, 2 insertions, 0 deletions

diff --git a/format.c b/format.c
index afa6af5d..b2426e9d 100644
--- a/format.c
+++ b/format.c
@@ -505,6 +505,8 @@ format_create_flags(int flags)
 	format_add_cb(ft, "host", format_cb_host);
 	format_add_cb(ft, "host_short", format_cb_host_short);
 	format_add_cb(ft, "pid", format_cb_pid);
+	format_add(ft, "socket_path", "%s", socket_path);
+	format_add_tv(ft, "start_time", &start_time);
 
 	return (ft);
 }