3 files changed, 10 insertions, 8 deletions

diff --git a/.buildbot/firefly-x86_64-amdepyc_test_tng.sh b/.buildbot/firefly-x86_64-amdepyc_test_tng.sh
index 031615517..75a1cb994 100644..100755
--- a/.buildbot/firefly-x86_64-amdepyc_test_tng.sh
+++ b/.buildbot/firefly-x86_64-amdepyc_test_tng.sh
@@ -3,6 +3,6 @@
 # echo "Skipped"
 
 pushd src/transport
-make check TESTS='test_communicator_basic-tcp test_communicator_rekey-tcp'
+make check TESTS='test_communicator_basic-tcp test_communicator_rekey-tcp test_communicator_basic-unix'
 pkill --signal 9 -U buildbot gnunet
 popd
diff --git a/doc/index.html b/doc/index.html
index 827c04a71..93c0e7d9e 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -26,7 +26,7 @@
 
     <ul>
       <li><a href="/handbook/gnunet.html">GNUnet Reference Manual</li>
-      <li><a href="/gnunet-tutorial/tutorial.html">GNUnet C Tutorial</li>
+      <li><a href="/tutorial/gnunet-tutorial.html">GNUnet C Tutorial</li>
       <li><a href="/doxygen/">GNUnet Doxygen</li>
       <li><a href="https://rest.gnunet.org/">REST API</a></li>
       <li><a href="https://bib.gnunet.org/">Bibliography</a></li>
@@ -37,12 +37,13 @@
 
         <p>Please send general FSF &amp; GNU inquiries to
           <a href="mailto:gnu@gnu.org">&lt;gnu@gnu.org&gt;</a>.
-          There are also <a href="/contact/">other ways to contact</a>
-          the FSF.  Broken links and other corrections or suggestions can be sent
+          There are also <a href="https://gnunet.org/en/contact/">other
+          ways to contact</a>
+          us.  Broken links and other corrections or suggestions can be sent
           to <a href="mailto:gnunet-developers@gnu.org">&lt;gnunet-developers@gnu.org&gt;</a>.</p>
       </div>
 
-      <p>Copyright &copy; 2001 - 2019 GNUnet e.V.</p>
+      <p>Copyright &copy; 2001 - 2020 GNUnet e.V.</p>
 
       <p>
         <a rel="license" href="http://creativecommons.org/licenses/by-nd/4.0/">
diff --git a/src/transport/test_communicator_basic.c b/src/transport/test_communicator_basic.c
index aa02bda93..e3573ac2c 100644
--- a/src/transport/test_communicator_basic.c
+++ b/src/transport/test_communicator_basic.c
@@ -221,7 +221,7 @@ make_payload (size_t payload_size)
   GNUNET_assert (payload_size >= 8); // So that out timestamp fits
   ts = GNUNET_TIME_absolute_get ();
   ts_n = GNUNET_TIME_absolute_hton (ts);
-  memset (payload, 0, payload_size);
+  memset (payload, 'a', payload_size);
   memcpy (payload, &ts_n, sizeof (struct GNUNET_TIME_AbsoluteNBO));
   return payload;
 }
@@ -367,8 +367,9 @@ add_queue_cb (void *cls,
        "Queue established, starting test...\n");
   start_short = GNUNET_TIME_absolute_get ();
   my_tc = tc_h;
-  if (0 != mtu)
-    long_message_size = mtu - 4; /* Dummy message header overhead */
+  if (0 != mtu) /* Message header overhead */
+    long_message_size = mtu - sizeof(struct GNUNET_TRANSPORT_SendMessageTo)
+                        - sizeof(struct GNUNET_MessageHeader);
   else
     long_message_size = LONG_MESSAGE_SIZE;
   phase = TP_BURST_SHORT;