merge

diff --cc src/transport/test_communicator_basic.c
index 4dba9d50ccb8b4f8fe2423f453952056e52176b4,e9b982897688d250e3ad9b3cb34397d722fbfdf4..db396ba661a3a62c31441af07d04f9dfa70a0f11
--- 1/src/transport/test_communicator_basic.c
--- 2/src/transport/test_communicator_basic.c
+++ b/src/transport/test_communicator_basic.c
@@@ -196,9 -198,18 +198,17 @@@ static voi
  latency_timeout (void *cls)
  {
    to_task = NULL;
+   if (GNUNET_TIME_absolute_get_remaining (timeout).rel_value_us > 0)
+   {
+     to_task = GNUNET_SCHEDULER_add_at (timeout,
+                                        &latency_timeout,
+                                        NULL);
+     return;
+   }
+ 
    GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
 -              "Latency too high. Test failed. (Phase: %d. Received: %lu\n",
 -              phase,
 -              num_received);
 +              "Latency too high. Test failed. (Phase: %d. Sent: %lu, Received: %lu)\n",
 +              phase, num_sent, num_received);
    ret = 2;
    GNUNET_SCHEDULER_shutdown ();
  }