Merge changes from upstream

llarp/messages/relay.hpp

@@ -40,12 +40,6 @@ namespace llarp
     PathID_t pathid;
     Encrypted< MAX_LINK_MSG_SIZE - 128 > X;
     TunnelNonce Y;
-<<<<<<< HEAD
-=======
-    RelayDownstreamMessage() = default;
-    RelayDownstreamMessage(ILinkSession* from);
-    ~RelayDownstreamMessage() = default;
->>>>>>> Move remaining messages around
 
     bool
     DecodeKey(const llarp_buffer_t& key, llarp_buffer_t* buf) override;

llarp/messages/relay_commit.cpp

@@ -1,6 +1,7 @@
 #include <messages/relay_commit.hpp>
 
 #include <crypto/crypto.hpp>
+#include <nodedb.hpp>
 #include <path/path_context.hpp>
 #include <path/transit_hop.hpp>
 #include <router/abstractrouter.hpp>