Merge master into next (rekey jitter, Phase 5 settle, acl-allowlist, CI concurrency)

# Conflicts:
#	CHANGELOG.md

src/node/tests/session.rs

@@ -67,6 +67,68 @@ fn test_session_entry_new_initiating() {
     assert_eq!(entry.last_activity(), 1000);
 }
 
+#[test]
+fn test_session_entry_rekey_jitter_in_range() {
+    use crate::node::REKEY_JITTER_SECS;
+    use crate::noise::HandshakeState;
+
+    // Every newly constructed SessionEntry's jitter must lie in the
+    // symmetric range [-REKEY_JITTER_SECS, +REKEY_JITTER_SECS].
+    for _ in 0..100 {
+        let identity_a = Identity::generate();
+        let identity_b = Identity::generate();
+        let handshake =
+            HandshakeState::new_initiator(identity_a.keypair(), identity_b.pubkey_full());
+        let entry = crate::node::session::SessionEntry::new(
+            *identity_b.node_addr(),
+            identity_b.pubkey_full(),
+            EndToEndState::Initiating(handshake),
+            1000,
+            true,
+        );
+        let j = entry.rekey_jitter_secs();
+        assert!(
+            (-REKEY_JITTER_SECS..=REKEY_JITTER_SECS).contains(&j),
+            "jitter {} outside [-{}, +{}]",
+            j,
+            REKEY_JITTER_SECS,
+            REKEY_JITTER_SECS
+        );
+    }
+}
+
+#[test]
+fn test_session_entry_rekey_jitter_mean_near_zero() {
+    use crate::noise::HandshakeState;
+
+    // Sanity check that the distribution is roughly symmetric and not
+    // stuck at one extreme. With N=200 draws from a uniform ~30-second
+    // range, the empirical mean should be well under 5 in absolute value.
+    let mut sum: i64 = 0;
+    let n: i64 = 200;
+    for _ in 0..n {
+        let identity_a = Identity::generate();
+        let identity_b = Identity::generate();
+        let handshake =
+            HandshakeState::new_initiator(identity_a.keypair(), identity_b.pubkey_full());
+        let entry = crate::node::session::SessionEntry::new(
+            *identity_b.node_addr(),
+            identity_b.pubkey_full(),
+            EndToEndState::Initiating(handshake),
+            1000,
+            true,
+        );
+        sum += entry.rekey_jitter_secs();
+    }
+    let mean = sum / n;
+    assert!(
+        mean.abs() < 5,
+        "empirical mean {} not within 5 of 0 over {} samples",
+        mean,
+        n
+    );
+}
+
 #[test]
 fn test_session_entry_touch() {
     use crate::noise::HandshakeState;