Merge pull request #1582 from majestrate/issue-1562-2021-03-18

fix issue #1562

llarp/router/rc_lookup_handler.cpp

@@ -270,8 +270,7 @@ namespace llarp
 
       if (lookupRouters.size() > LookupPerTick)
       {
-        static std::mt19937_64 rng{llarp::randint()};
+        std::shuffle(lookupRouters.begin(), lookupRouters.end(), CSRNG{});
-        std::shuffle(lookupRouters.begin(), lookupRouters.end(), rng);
         lookupRouters.resize(LookupPerTick);
       }
 

llarp/service/outbound_context.cpp

@@ -410,9 +410,7 @@ namespace llarp
       std::vector<Introduction> intros = currentIntroSet.I;
       if (intros.size() > 1)
       {
-        std::random_device rd;
+        std::shuffle(intros.begin(), intros.end(), CSRNG{});
-        std::mt19937 g(rd());
-        std::shuffle(intros.begin(), intros.end(), g);
       }
 
       // to find a intro on the same router as before that is newer