Merge pull request #2575 from tnull/2023-09-fix-debug-panic
authorMatt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Thu, 28 Sep 2023 20:30:29 +0000 (20:30 +0000)
committerGitHub <noreply@github.com>
Thu, 28 Sep 2023 20:30:29 +0000 (20:30 +0000)
Various router fixes and #2417 follow-ups


Trivial merge