libquic/oxenc vbumps

5 months ago · 4251172707
parent 7b8c8fde52
commit 4251172707
3 changed files with 6 additions and 2 deletions
--- a/external/oxen-encoding
+++ b/external/oxen-encoding
@ -1 +1 @@
-Subproject commit f6172d58d3358473a4c98d96270058a32e166d5f
+Subproject commit 24fbdb794ef26bf5324d1b56d48d1da8de8a140c
--- a/external/oxen-libquic
+++ b/external/oxen-libquic
@ -1 +1 @@
-Subproject commit 89d85ffeabbc773a1ea20d05b7f9c2a13c5e8370
+Subproject commit 78b46d4f4df45747b70918386672228ead2c7ed3
--- a/llarp/router/router.cpp
+++ b/llarp/router/router.cpp
@ -866,8 +866,12 @@ namespace llarp
      {
        log::critical(logcat, "Regenerating and gossiping RC...");

+<<<<<<< Updated upstream
        router_contact.resign();
        save_rc();
+=======
+        auto view = router_contact.view();
+>>>>>>> Stashed changes

        _link_manager->gossip_rc(
            router_contact.router_id(),