Merge branch 'obsd-master'

Conflicts:
	server.c

1 files changed, 0 insertions, 1 deletions

diff --git a/proc.c b/proc.c
index f7007935..30997a21 100644
--- 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);
 }