Merge pull request #1896 from majestrate/unstuck-obctx-2022-04-17

handle edge case better

llarp/service/outbound_context.cpp

@@ -45,11 +45,10 @@ namespace llarp
       if (dst == remoteIntro.pathID && remoteIntro.router == p->Endpoint())
       {
         LogWarn(Name(), " message ", seq, " dropped by endpoint ", p->Endpoint(), " via ", dst);
+        markedBad = remoteIntro.IsExpired(Now());
         MarkCurrentIntroBad(Now());
-        ShiftIntroduction(false);
+        ShiftIntroRouter(p->Endpoint());
         UpdateIntroSet();
-        SwapIntros();
-        markedBad = remoteIntro.IsExpired(Now());
       }
       return true;
     }