Merge branch 'obsd-master'

Conflicts: server.c
2025-09-03 14:27:09 +00:00 · 2015-10-31 23:56:35 +00:00
parent 17f6c3be8e ba7fb49fb9
commit c975de2e07
10 changed files with 25 additions and 55 deletions
--- a/proc.c
+++ b/proc.c
@ -121,7 +121,6 @@ peer_check_version(struct tmuxpeer *peer, struct imsg *imsg)

 		return (-1);
 	}
-	imsg->hdr.peerid >>= 8;
 	return (0);
 }