===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-fn.c,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- src/usr.bin/tmux/server-fn.c	2015/12/11 12:39:47	1.95
+++ src/usr.bin/tmux/server-fn.c	2015/12/12 18:32:24	1.96
@@ -1,4 +1,4 @@
-/* $OpenBSD: server-fn.c,v 1.95 2015/12/11 12:39:47 nicm Exp $ */
+/* $OpenBSD: server-fn.c,v 1.96 2015/12/12 18:32:24 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -384,6 +384,7 @@
 		} else {
 			c->last_session = NULL;
 			c->session = s_new;
+			server_client_set_key_table(c, NULL);
 			status_timer_start(c);
 			notify_attached_session_changed(c);
 			session_update_activity(s_new, NULL);