merge conflict fix

llarp/router/rc_lookup_handler.cpp

@@ -255,8 +255,8 @@ namespace llarp
 
     if(useWhitelist)
     {
-      static constexpr size_t LookupPerTick   = 25;
       static constexpr auto RerequestInterval = 10min;
+      static constexpr size_t LookupPerTick = 5;
 
       std::vector< RouterID > lookupRouters;
       lookupRouters.reserve(LookupPerTick);

llarp/router/router.cpp

@@ -698,7 +698,10 @@ namespace llarp
       connected += _linkManager.NumberOfPendingConnections();
     }
 
-    _rcLookupHandler.ExploreNetwork();
+    const int interval = isSvcNode ? 30 : 5;
+
+    if((Uptime() / 1000) % interval == 0)
+      _rcLookupHandler.ExploreNetwork();
 
     size_t connectToNum      = _outboundSessionMaker.minConnectedRouters;
     const auto strictConnect = _rcLookupHandler.NumberOfStrictConnectRouters();