diff -Nru openssh-7.9p1/debian/changelog openssh-7.9p1/debian/changelog
--- openssh-7.9p1/debian/changelog	2020-01-31 21:55:34.000000000 +0100
+++ openssh-7.9p1/debian/changelog	2023-03-29 11:02:23.000000000 +0200
@@ -1,3 +1,12 @@
+openssh (1:7.9p1-10+deb10u3~isgee1) buster-security; urgency=high
+
+  * Non-maintainer upload.
+  * ssh(1): Fix bad interaction between the ssh_config ConnectTimeout
+    and ConnectionAttempts directives - connection attempts after the
+    first were ignoring the requested timeout (LP: #1798049).
+
+ -- Salvatore Bonaccorso <carnil@debian.org>  Wed, 29 Mar 2023 11:02:23 +0200
+
 openssh (1:7.9p1-10+deb10u2) buster; urgency=medium
 
   * Apply upstream patch to deny (non-fatally) ipc in the seccomp sandbox,
diff -Nru openssh-7.9p1/debian/patches/bug2918.patch openssh-7.9p1/debian/patches/bug2918.patch
--- openssh-7.9p1/debian/patches/bug2918.patch	1970-01-01 01:00:00.000000000 +0100
+++ openssh-7.9p1/debian/patches/bug2918.patch	2023-03-29 11:01:15.000000000 +0200
@@ -0,0 +1,26 @@
+Description: ssh(1): Fix bad interaction between the ssh_config ConnectTimeout and ConnectionAttempts directives
+ Connection attempts after the first were ignoring the requested timeout
+Origin: upstream, https://bugzilla.mindrot.org/attachment.cgi?id=3233
+Bug: https://bugzilla.mindrot.org/show_bug.cgi?id=2918
+Forwarded: no
+Last-Update: 2023-03-29
+
+--- a/sshconnect.c
++++ b/sshconnect.c
+@@ -500,7 +500,7 @@ ssh_connect_direct(struct ssh *ssh, cons
+     struct sockaddr_storage *hostaddr, u_short port, int family,
+     int connection_attempts, int *timeout_ms, int want_keepalive)
+ {
+-	int on = 1;
++	int on = 1, saved_timeout_ms = *timeout_ms;
+ 	int oerrno, sock = -1, attempt;
+ 	char ntop[NI_MAXHOST], strport[NI_MAXSERV];
+ 	struct addrinfo *ai;
+@@ -544,6 +544,7 @@ ssh_connect_direct(struct ssh *ssh, cons
+ 				continue;
+ 			}
+ 
++			*timeout_ms = saved_timeout_ms;
+ 			if (timeout_connect(sock, ai->ai_addr, ai->ai_addrlen,
+ 			    timeout_ms) >= 0) {
+ 				/* Successful connection. */
diff -Nru openssh-7.9p1/debian/patches/series openssh-7.9p1/debian/patches/series
--- openssh-7.9p1/debian/patches/series	2020-01-31 21:55:34.000000000 +0100
+++ openssh-7.9p1/debian/patches/series	2023-03-29 11:00:38.000000000 +0200
@@ -34,3 +34,4 @@
 revert-ipqos-defaults.patch
 seccomp-handle-shm.patch
 sandbox-seccomp-ipc.patch
+bug2918.patch