Merge branch 'master' of git+ssh://git.gnunet.org/gnunet

9 files changed, 3 insertions, 5 deletions

diff --git a/ci/Containerfile b/contrib/ci/Containerfile
index e0778e7b7..e0778e7b7 100644
--- a/ci/Containerfile
+++ b/contrib/ci/Containerfile
diff --git a/ci/ci.sh b/contrib/ci/ci.sh
index 7dd3a957a..7dd3a957a 100755
--- a/ci/ci.sh
+++ b/contrib/ci/ci.sh
diff --git a/ci/jobs/0-build/build.sh b/contrib/ci/jobs/0-build/build.sh
index a5a89ca82..a5a89ca82 100755
--- a/ci/jobs/0-build/build.sh
+++ b/contrib/ci/jobs/0-build/build.sh
diff --git a/ci/jobs/0-build/job.sh b/contrib/ci/jobs/0-build/job.sh
index 8d79902c5..8d79902c5 100755
--- a/ci/jobs/0-build/job.sh
+++ b/contrib/ci/jobs/0-build/job.sh
diff --git a/ci/jobs/2-deb-package/job.sh b/contrib/ci/jobs/2-deb-package/job.sh
index fc1f114f4..fc1f114f4 100755
--- a/ci/jobs/2-deb-package/job.sh
+++ b/contrib/ci/jobs/2-deb-package/job.sh
diff --git a/ci/jobs/2-deb-package/version.sh b/contrib/ci/jobs/2-deb-package/version.sh
index 74d0099a2..74d0099a2 100755
--- a/ci/jobs/2-deb-package/version.sh
+++ b/contrib/ci/jobs/2-deb-package/version.sh
diff --git a/ci/jobs/3-deploy-package/config.ini b/contrib/ci/jobs/3-deploy-package/config.ini
index 8d6409a6e..08c106f9c 100644
--- a/ci/jobs/3-deploy-package/config.ini
+++ b/contrib/ci/jobs/3-deploy-package/config.ini
@@ -3,3 +3,4 @@ HALT_ON_FAILURE = True
 WARN_ON_FAILURE = True
 CONTAINER_BUILD = False
 CONTAINER_NAME = nixery.dev/shell/rsync
+CONTAINER_ARCH = amd64
diff --git a/ci/jobs/3-deploy-package/job.sh b/contrib/ci/jobs/3-deploy-package/job.sh
index d53588a0f..d53588a0f 100755
--- a/ci/jobs/3-deploy-package/job.sh
+++ b/contrib/ci/jobs/3-deploy-package/job.sh
diff --git a/src/service/transport/gnunet-service-transport.c b/src/service/transport/gnunet-service-transport.c
index 5cce27b1c..efc09389b 100644
--- a/src/service/transport/gnunet-service-transport.c
+++ b/src/service/transport/gnunet-service-transport.c
@@ -10277,10 +10277,7 @@ transmit_on_queue (void *cls)
     struct GNUNET_TIME_Relative plus = GNUNET_TIME_relative_multiply (
       wait_duration, wait_multiplier);
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-                "Waiting %s (%s) for ACK until %s\n",
-                GNUNET_STRINGS_relative_time_to_string (
-                  GNUNET_TIME_relative_multiply (
-                    queue->pd.aged_rtt, wait_multiplier), GNUNET_NO),
+                "Waiting %s for ACK until %s\n",
                 GNUNET_STRINGS_relative_time_to_string (plus, GNUNET_YES),
                 GNUNET_STRINGS_absolute_time_to_string (next));
     update_pm_next_attempt (pm,
@@ -10994,7 +10991,7 @@ neighbour_dv_monotime_cb (void *cls,
     n->dv_monotime_available = GNUNET_YES;
     return;
   }
-  if (sizeof(*mtbe) != record->value_size)
+  if (0 == record->value_size)
   {
     GNUNET_break (0);
     return;