342 files changed, 7063 insertions, 5978 deletions

diff --git a/.buildbot/firefly-x86_64-amdepyc_deploy.sh b/.buildbot/firefly-x86_64-amdepyc_deploy.sh
index b956a3d92..8ba9d35be 100755
--- a/.buildbot/firefly-x86_64-amdepyc_deploy.sh
+++ b/.buildbot/firefly-x86_64-amdepyc_deploy.sh
@@ -2,5 +2,8 @@
 
 # Deploy docs from buildbot
 
+cd doc
+make html
+cd ..
 chmod -R ag+rX doc/
 rsync -a --delete doc/ handbook@firefly.gnunet.org:~/doc_deployment/
diff --git a/ChangeLog b/ChangeLog
index c6d4153c0..4ed6576e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,81 @@
+Thu, 9 Jul 2020 09:09:50 +0200 (5a0df5e18)
+fix: raise ATS quotas to 10 MiB #6426 - Martin Schanzenbach
+
+Mon, 6 Jul 2020 23:34:48 +0200 (309ad1364)
+fix: cadet fix to use correct tunnel end - Martin Schanzenbach
+
+Mon, 6 Jul 2020 22:29:59 +0200 (13b2791f4)
+fix: do not use udp plugin for tests - Martin Schanzenbach
+
+Mon, 6 Jul 2020 21:33:06 +0200 (29131b26c)
+fix: update test hostkeys - Martin Schanzenbach
+
+Mon, 6 Jul 2020 20:19:00 +0200 (f0ecab499)
+fix: namestore rest test - Martin Schanzenbach
+
+Sun, 5 Jul 2020 21:59:40 +0200 (7247d3f1f)
+style fix: use correct type - Christian Grothoff
+
+Sat, 4 Jul 2020 19:06:49 +0200 (1d417dcd0)
+Fix_build_dependencies - Martin Schanzenbach
+
+Sun, 5 Jul 2020 16:32:34 +0200 (e31c1d4a9)
+GNUNET_free_non_null -> GNUNET_free - Christian Grothoff
+
+Sun, 5 Jul 2020 15:21:55 +0200 (143755664)
+build: fix libidn2 detection if prefix given (#5948) - Martin Schanzenbach
+
+Sun, 28 Jun 2020 22:38:45 +0200 (8c2243f05)
+Prevent user from storing records which belong in a BOX - Martin Schanzenbach
+
+Sun, 21 Jun 2020 22:06:35 +0200 (612704d69)
+GNS: dns2gns now randomizes answers from GNS record set - Martin Schanzenbach
+
+Tue, 16 Jun 2020 01:48:00 +0200 (e500e9ec3)
+Set workbits for PoWs to more realistic values - Martin Schanzenbach
+
+Sun, 14 Jun 2020 16:36:08 +0200 (a3a89edc0)
+doc->preface: rewrite 'GNUnet may also' sentence, remove 2 TODO items. - nikita
+
+Fri, 12 Jun 2020 12:51:46 +0200 (726ac3ef2)
+Fixed 5528: TCP *communicator* bindto option should support DNS names, and 6013: TCP communicator should bind to IPv6 and IPv4 if only port given - t3sserakt
+
+Fri, 5 Jun 2020 16:37:10 +0200 (d22eacb13)
+Fixed bug #5822 by adding a monotonic time to the connection create message of a peer that want to start a KX, and the corresponding test #5823. Credits to dvn, lurchi and xrs for helpful discussions and coding. - t3sserakt
+
+Mon, 1 Jun 2020 19:08:32 +0200 (59f616a3c)
+tng: do not handle message send more than once - Martin Schanzenbach
+
+Mon, 1 Jun 2020 18:45:46 +0200 (d11bffdc2)
+tng: fix for macos unix socket handling - Martin Schanzenbach
+
+Mon, 1 Jun 2020 18:43:32 +0200 (583bc67ba)
+tng: MTU fix for other UNIXes, log message - Martin Schanzenbach
+
+Mon, 1 Jun 2020 18:18:00 +0200 (d20be8a91)
+tng: UNIX communicator fixes. Test fixes - Martin Schanzenbach
+
+Mon, 1 Jun 2020 16:39:35 +0200 (198c09654)
+tng: more UDP communicator backchannels - Martin Schanzenbach
+
+Sat, 30 May 2020 17:45:38 +0200 (a325c3eaa)
+towards UDP backchannels - Martin Schanzenbach
+
+Fri, 29 May 2020 22:31:37 -0400 (63109da3e)
+rsa crypto compare functions take const parameters - Jonathan Buchanan
+
+Wed, 27 May 2020 15:01:30 +0200 (cf4608196)
+Make REQUEST_AGPL messages configurable and add handler by default - Christian Grothoff
+
+Wed, 27 May 2020 09:32:06 +0200 (f2127cd6a)
+add lastlog script - Martin Schanzenbach
+
+Wed, 27 May 2020 09:25:44 +0200 (eec3fd03c)
+changelog from git log - Martin Schanzenbach
+
+Wed, 27 May 2020 08:23:47 +0200 (b89c1f2a8)
+update changelog, new format - Martin Schanzenbach
+
 Tue, 26 May 2020 11:49:50 +0200 (755cb5c76)
 remove argon2 dependency. Use limited libsodium argon2id function for GNS and NSE - Martin Schanzenbach
 
diff --git a/configure.ac b/configure.ac
index 6dc914c12..39e7ffa7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # This file is part of GNUnet.
-# (C) 2001--2019 GNUnet e.V.
+# (C) 2001--2020 GNUnet e.V.
 #
 # GNUnet is free software: you can redistribute it and/or modify it
 # under the terms of the GNU Affero General Public License as published
@@ -21,7 +21,7 @@
 #
 AC_PREREQ(2.61)
 # Checks for programs.
-AC_INIT([gnunet], [0.12.2], [bug-gnunet@gnu.org])
+AC_INIT([gnunet], [0.13.1], [bug-gnunet@gnu.org])
 AC_CONFIG_AUX_DIR([build-aux])
 
 # check for legacy option that is no longer supported (#5627) and fail hard
@@ -1160,8 +1160,12 @@ AS_IF([test x_$withval = x_yes],
                                          my_with_libidn2=0]))],
       [AS_IF([test x_$withval != x_no],
              [CFLAGS="$CFLAGS -I$withval/include"
-              LDFLAGS="$LDFLAGS -L$withval/lib"],
-                  [my_with_libidn2=0])])
+              LDFLAGS="$LDFLAGS -L$withval/lib"
+              AC_CHECK_HEADERS([idn2/idn2.h],
+                               AC_MSG_NOTICE([Found idn2/idn2.h]),
+                               [AC_MSG_NOTICE([Failed to find idn2.h])
+                               my_with_libidn2=0])],
+             [my_with_libidn2=0])])
 
 AC_MSG_CHECKING([if libidn can be used])
 # Check for LIBIDNs
diff --git a/contrib/build-common b/contrib/build-common
-Subproject 1915a74bbb4cd2ae9bc541a382dfebc37064a2f
+Subproject d81bbfabc2538932f631d3946bd6a9b95182b4f
diff --git a/contrib/scripts/changelog_delta.sh b/contrib/scripts/changelog_delta.sh
index 1c14d69e2..f115f1ef1 100644
--- a/contrib/scripts/changelog_delta.sh
+++ b/contrib/scripts/changelog_delta.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 LASTHASH=$(head -n1 ChangeLog | cut -d " " -f 7 | tr -d \( | tr -d \))
-git log --invert-grep --grep="^- " --no-merges --no-color --format="%aD (%h)%n%s - %cN%n" $LASTHASH..HEAD
+git log --invert-grep --grep="^-" --no-merges --no-color --format="%aD (%h)%n%s - %cN%n" $LASTHASH..HEAD
diff --git a/contrib/scripts/gnunet-bugreport b/contrib/scripts/gnunet-bugreport
index 4c12313df..7ce8941cb 100755
--- a/contrib/scripts/gnunet-bugreport
+++ b/contrib/scripts/gnunet-bugreport
@@ -416,7 +416,7 @@ gnugettext_check()
 
 gettext_check()
 {
-    if test -z "`type getext | awk '/not found/'`"; then
+    if test -z "`type gettext | awk '/not found/'`"; then
         infomsg "gettext        : Found"
     else
         infomsg "gettext        : Not Found"
diff --git a/contrib/testing_hostkeys.ecc b/contrib/testing_hostkeys.ecc
index 194d0da78..29bd6ece2 100644
--- a/contrib/testing_hostkeys.ecc
+++ b/contrib/testing_hostkeys.ecc
diff --git a/doc/handbook/chapters/developer.texi b/doc/handbook/chapters/developer.texi
index ca76a5f2b..6d8ddd3c2 100644
--- a/doc/handbook/chapters/developer.texi
+++ b/doc/handbook/chapters/developer.texi
@@ -92,33 +92,25 @@ introduction, each of the GNUnet subsystems (directories in the
 addition to this documentation, GNUnet developers should be aware of the
 services available on the GNUnet server to them.
 
-New developers can have a look a the GNUnet tutorials for C and java
-available in the @file{src/} directory of the repository or under the
-following links:
+New developers can have a look a the @uref{https://docs.gnunet.org/tutorial/gnunet-tutorial.html, GNUnet C tutorial}.
 
 @c ** FIXME: Link to files in source, not online.
 @c ** FIXME: Where is the Java tutorial?
-@itemize @bullet
-@item @xref{Top, Introduction,, gnunet-c-tutorial, The GNUnet C Tutorial}.
-@item @uref{https://docs.gnunet.org/tutorial/gnunet-tutorial.html, GNUnet C tutorial}
-@item GNUnet Java tutorial
-@end itemize
 
 In addition to the GNUnet Reference Documentation you are reading,
 the GNUnet server at @uref{https://gnunet.org} contains
 various resources for GNUnet developers and those
 who aspire to become regular contributors.
 They are all conveniently reachable via the "Developer"
-entry in the navigation menu. Some additional tools (such as static
-analysis reports) require a special developer access to perform certain
+entry in the navigation menu. Some additional tools (such as continuous
+integration) require a special developer access to perform certain
 operations. If you want (or require) access, you should contact
-@uref{http://grothoff.org/christian/, Christian Grothoff},
-GNUnet's maintainer.
+GNUnet's maintainers.
 
 @c FIXME: A good part of this belongs on the website or should be
 @c extended in subsections explaining usage of this. A simple list
 @c is just taking space people have to read.
-The public subsystems on the GNUnet server that help developers are:
+The developer services on the GNUnet project infrastructure are:
 
 @itemize @bullet
 
@@ -136,19 +128,21 @@ It can be accessed at
 @uref{https://bugs.gnunet.org/, https://bugs.gnunet.org/}.
 Anyone can report bugs.
 
-@item The current quality of our automated test suite is assessed using
-code coverage analysis. Testcases that
-improve our code coverage are always welcome.
+@item Continuous integration (Buildbot).
+Used to build gnunet and its websites upon new commits.
+It can be accessed at
+@uref{https://buildbot.gnunet.org/, https://buildbot.gnunet.org/}.
+Anyone can see the builds.
 
-@item We try to automatically find bugs using a static analysis using
-various tools. Note that not everything that is flagged by the
+@item Regularly we make use of static analysis tools.
+Note that not everything that is flagged by the
 analysis is a bug, sometimes even good code can be marked as possibly
 problematic. Nevertheless, developers are encouraged to at least be
 aware of all issues in their code that are listed.
 
-@item We use Gauger for automatic performance regression visualization.
+@c @item We use Gauger for automatic performance regression visualization.
 @c FIXME: LINK!
-Details on how to use Gauger are here.
+@c Details on how to use Gauger are here.
 
 @end itemize
 
@@ -515,6 +509,9 @@ without exposing the private input vectors of the peers to each other.
 @item @file{consensus/}
 The consensus service will allow a set of peers to agree
 on a set of values via a distributed set union computation.
+@item @file{reclaim/}
+A decentralized personal data sharing service used to realize a decentralized
+identity provider. Supports OpenID Connect. See also @uref{https://reclaim.gnunet.org}.
 @item @file{rest/}
 The rest API allows access to GNUnet services using RESTful interaction.
 The services provide plugins that can exposed by the rest server.
@@ -640,7 +637,7 @@ respective protocols or APIs:
 @item testbed @tab n/a @tab testing @tab testing
 @item testing @tab n/a @tab n/a @tab testing
 @item topology @tab n/a @tab n/a @tab n/a
-@item transport @tab stable @tab stable @tab stable
+@item transport @tab experimental @tab experimental @tab experimental
 @item tun @tab n/a @tab n/a @tab stable
 @item vpn @tab testing @tab n/a @tab n/a
 @end multitable
@@ -1219,9 +1216,6 @@ accordingly with your own Operating System environment.
 For the full list of dependencies, consult the appropriate, up-to-date
 section in the @file{README} file.
 
-First, we need to build or install (depending on your OS) the following
-packages. If you build them from source, build them in this exact order:
-
 @example
 libgpgerror, libgcrypt, libnettle, libunbound, GnuTLS (with libunbound
 support)
diff --git a/doc/handbook/chapters/preface.texi b/doc/handbook/chapters/preface.texi
index 443fb2600..6268e3b28 100644
--- a/doc/handbook/chapters/preface.texi
+++ b/doc/handbook/chapters/preface.texi
@@ -181,6 +181,15 @@ GNUnet maintainer can overrule any decisions made by individual
 developers.  Still, in practice neither has happened in the last 20
 years for GNUnet, and we hope to keep it that way.
 
+The current maintainers of GNUnet are:
+
+@itemize @bullet
+
+@item @uref{https://grothoff.org/christian/, Christian Grothoff}
+@item @uref{https://schanzen.eu, Martin Schanzenbach}
+
+@end itemize
+
 The GNUnet project is supported by GNUnet e.V., a German association
 where any developer can become a member.  GNUnet e.V. serves as a
 legal entity to hold the copyrights to GNUnet.  GNUnet e.V. may also
diff --git a/doc/handbook/chapters/user.texi b/doc/handbook/chapters/user.texi
index 998abb87f..523f286d0 100644
--- a/doc/handbook/chapters/user.texi
+++ b/doc/handbook/chapters/user.texi
@@ -78,7 +78,7 @@ respective public key (you will learn how below) and extend the
 configuration:
 
 @example
-$ gnunet-config -s gns -n .myfriend -V PUBLIC_KEY
+$ gnunet-config -s gns -o .myfriend -V PUBLIC_KEY
 @end example
 
 @node Managing Egos
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 533b2dda9..9ad5b4862 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -10,21 +10,13 @@ src/arm/arm_monitor_api.c
 src/arm/gnunet-arm.c
 src/arm/gnunet-service-arm.c
 src/arm/mockup-service.c
-src/ats-tests/ats-testing-experiment.c
-src/ats-tests/ats-testing-log.c
-src/ats-tests/ats-testing-preferences.c
-src/ats-tests/ats-testing-traffic.c
-src/ats-tests/ats-testing.c
-src/ats-tests/gnunet-ats-sim.c
-src/ats-tests/gnunet-solver-eval.c
-src/ats-tool/gnunet-ats.c
 src/ats/ats_api_connectivity.c
 src/ats/ats_api_performance.c
 src/ats/ats_api_scanner.c
 src/ats/ats_api_scheduling.c
 src/ats/gnunet-ats-solver-eval.c
-src/ats/gnunet-service-ats.c
 src/ats/gnunet-service-ats_addresses.c
+src/ats/gnunet-service-ats.c
 src/ats/gnunet-service-ats_connectivity.c
 src/ats/gnunet-service-ats_normalization.c
 src/ats/gnunet-service-ats_performance.c
@@ -33,6 +25,14 @@ src/ats/gnunet-service-ats_preferences.c
 src/ats/gnunet-service-ats_reservations.c
 src/ats/gnunet-service-ats_scheduling.c
 src/ats/plugin_ats_proportional.c
+src/ats-tests/ats-testing.c
+src/ats-tests/ats-testing-experiment.c
+src/ats-tests/ats-testing-log.c
+src/ats-tests/ats-testing-preferences.c
+src/ats-tests/ats-testing-traffic.c
+src/ats-tests/gnunet-ats-sim.c
+src/ats-tests/gnunet-solver-eval.c
+src/ats-tool/gnunet-ats.c
 src/auction/gnunet-auction-create.c
 src/auction/gnunet-auction-info.c
 src/auction/gnunet-auction-join.c
@@ -42,6 +42,7 @@ src/block/block.c
 src/block/plugin_block_template.c
 src/block/plugin_block_test.c
 src/cadet/cadet_api.c
+src/cadet/cadet_api_drop_message.c
 src/cadet/cadet_api_get_channel.c
 src/cadet/cadet_api_get_path.c
 src/cadet/cadet_api_helper.c
@@ -49,8 +50,8 @@ src/cadet/cadet_api_list_peers.c
 src/cadet/cadet_api_list_tunnels.c
 src/cadet/cadet_test_lib.c
 src/cadet/desirability_table.c
-src/cadet/gnunet-cadet-profiler.c
 src/cadet/gnunet-cadet.c
+src/cadet/gnunet-cadet-profiler.c
 src/cadet/gnunet-service-cadet.c
 src/cadet/gnunet-service-cadet_channel.c
 src/cadet/gnunet-service-cadet_connection.c
@@ -66,15 +67,15 @@ src/consensus/gnunet-service-consensus.c
 src/consensus/plugin_block_consensus.c
 src/conversation/conversation_api.c
 src/conversation/conversation_api_call.c
-src/conversation/gnunet-conversation-test.c
 src/conversation/gnunet-conversation.c
-src/conversation/gnunet-helper-audio-playback-gst.c
+src/conversation/gnunet-conversation-test.c
+src/conversation/gnunet_gst.c
+src/conversation/gnunet_gst_test.c
 src/conversation/gnunet-helper-audio-playback.c
-src/conversation/gnunet-helper-audio-record-gst.c
+src/conversation/gnunet-helper-audio-playback-gst.c
 src/conversation/gnunet-helper-audio-record.c
+src/conversation/gnunet-helper-audio-record-gst.c
 src/conversation/gnunet-service-conversation.c
-src/conversation/gnunet_gst.c
-src/conversation/gnunet_gst_test.c
 src/conversation/microphone.c
 src/conversation/plugin_gnsrecord_conversation.c
 src/conversation/speaker.c
@@ -104,6 +105,7 @@ src/dht/dht_api.c
 src/dht/dht_test_lib.c
 src/dht/gnunet-dht-get.c
 src/dht/gnunet-dht-monitor.c
+src/dht/gnunet_dht_profiler.c
 src/dht/gnunet-dht-put.c
 src/dht/gnunet-service-dht.c
 src/dht/gnunet-service-dht_clients.c
@@ -112,7 +114,6 @@ src/dht/gnunet-service-dht_hello.c
 src/dht/gnunet-service-dht_neighbours.c
 src/dht/gnunet-service-dht_nse.c
 src/dht/gnunet-service-dht_routing.c
-src/dht/gnunet_dht_profiler.c
 src/dht/plugin_block_dht.c
 src/dns/dns_api.c
 src/dns/gnunet-dns-monitor.c
@@ -147,8 +148,8 @@ src/fs/gnunet-auto-share.c
 src/fs/gnunet-daemon-fsprofiler.c
 src/fs/gnunet-directory.c
 src/fs/gnunet-download.c
-src/fs/gnunet-fs-profiler.c
 src/fs/gnunet-fs.c
+src/fs/gnunet-fs-profiler.c
 src/fs/gnunet-helper-fs-publish.c
 src/fs/gnunet-publish.c
 src/fs/gnunet-search.c
@@ -168,9 +169,9 @@ src/gns/gns_tld_api.c
 src/gns/gnunet-bcd.c
 src/gns/gnunet-dns2gns.c
 src/gns/gnunet-gns-benchmark.c
+src/gns/gnunet-gns.c
 src/gns/gnunet-gns-import.c
 src/gns/gnunet-gns-proxy.c
-src/gns/gnunet-gns.c
 src/gns/gnunet-service-gns.c
 src/gns/gnunet-service-gns_interceptor.c
 src/gns/gnunet-service-gns_resolver.c
@@ -187,8 +188,8 @@ src/gnsrecord/gnunet-gnsrecord-tvg.c
 src/gnsrecord/plugin_gnsrecord_dns.c
 src/hello/address.c
 src/hello/gnunet-hello.c
-src/hello/hello-ng.c
 src/hello/hello.c
+src/hello/hello-ng.c
 src/hostlist/gnunet-daemon-hostlist.c
 src/hostlist/gnunet-daemon-hostlist_client.c
 src/hostlist/gnunet-daemon-hostlist_server.c
@@ -213,8 +214,8 @@ src/namecache/namecache_api.c
 src/namecache/plugin_namecache_flat.c
 src/namecache/plugin_namecache_postgres.c
 src/namecache/plugin_namecache_sqlite.c
-src/namestore/gnunet-namestore-fcfsd.c
 src/namestore/gnunet-namestore.c
+src/namestore/gnunet-namestore-fcfsd.c
 src/namestore/gnunet-service-namestore.c
 src/namestore/gnunet-zoneimport.c
 src/namestore/namestore_api.c
@@ -240,17 +241,17 @@ src/nat/gnunet-service-nat_mini.c
 src/nat/gnunet-service-nat_stun.c
 src/nat/nat_api.c
 src/nat/nat_api_stun.c
-src/nse/gnunet-nse-profiler.c
 src/nse/gnunet-nse.c
+src/nse/gnunet-nse-profiler.c
 src/nse/gnunet-service-nse.c
 src/nse/nse_api.c
 src/nt/nt.c
-src/peerinfo-tool/gnunet-peerinfo.c
-src/peerinfo-tool/gnunet-peerinfo_plugins.c
-src/peerinfo-tool/plugin_rest_peerinfo.c
 src/peerinfo/gnunet-service-peerinfo.c
 src/peerinfo/peerinfo_api.c
 src/peerinfo/peerinfo_api_notify.c
+src/peerinfo-tool/gnunet-peerinfo.c
+src/peerinfo-tool/gnunet-peerinfo_plugins.c
+src/peerinfo-tool/plugin_rest_peerinfo.c
 src/peerstore/gnunet-peerstore.c
 src/peerstore/gnunet-service-peerstore.c
 src/peerstore/peerstore_api.c
@@ -296,27 +297,27 @@ src/rest/gnunet-rest-server.c
 src/rest/plugin_rest_config.c
 src/rest/plugin_rest_copying.c
 src/rest/rest.c
-src/revocation/gnunet-revocation-tvg.c
 src/revocation/gnunet-revocation.c
+src/revocation/gnunet-revocation-tvg.c
 src/revocation/gnunet-service-revocation.c
 src/revocation/plugin_block_revocation.c
 src/revocation/revocation_api.c
-src/rps/gnunet-rps-profiler.c
 src/rps/gnunet-rps.c
+src/rps/gnunet-rps-profiler.c
 src/rps/gnunet-service-rps.c
 src/rps/gnunet-service-rps_custommap.c
 src/rps/gnunet-service-rps_sampler.c
 src/rps/gnunet-service-rps_sampler_elem.c
 src/rps/gnunet-service-rps_view.c
+src/rps/rps_api.c
 src/rps/rps-sampler_client.c
 src/rps/rps-sampler_common.c
 src/rps/rps-test_util.c
-src/rps/rps_api.c
 src/scalarproduct/gnunet-scalarproduct.c
-src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
-src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
 src/scalarproduct/gnunet-service-scalarproduct_alice.c
 src/scalarproduct/gnunet-service-scalarproduct_bob.c
+src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c
+src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c
 src/scalarproduct/scalarproduct_api.c
 src/secretsharing/gnunet-secretsharing-profiler.c
 src/secretsharing/gnunet-service-secretsharing.c
@@ -342,16 +343,15 @@ src/statistics/gnunet-statistics.c
 src/statistics/statistics_api.c
 src/template/gnunet-service-template.c
 src/template/gnunet-template.c
-src/testbed-logger/gnunet-service-testbed-logger.c
-src/testbed-logger/testbed_logger_api.c
 src/testbed/generate-underlay-topology.c
 src/testbed/gnunet-daemon-latency-logger.c
 src/testbed/gnunet-daemon-testbed-blacklist.c
 src/testbed/gnunet-daemon-testbed-underlay.c
 src/testbed/gnunet-helper-testbed.c
+src/testbed/gnunet_mpi_test.c
 src/testbed/gnunet-service-test-barriers.c
-src/testbed/gnunet-service-testbed.c
 src/testbed/gnunet-service-testbed_barriers.c
+src/testbed/gnunet-service-testbed.c
 src/testbed/gnunet-service-testbed_cache.c
 src/testbed/gnunet-service-testbed_connectionpool.c
 src/testbed/gnunet-service-testbed_cpustatus.c
@@ -359,19 +359,20 @@ src/testbed/gnunet-service-testbed_links.c
 src/testbed/gnunet-service-testbed_meminfo.c
 src/testbed/gnunet-service-testbed_oc.c
 src/testbed/gnunet-service-testbed_peers.c
-src/testbed/gnunet-testbed-profiler.c
-src/testbed/gnunet_mpi_test.c
 src/testbed/gnunet_testbed_mpi_spawn.c
-src/testbed/testbed_api.c
+src/testbed/gnunet-testbed-profiler.c
+src/testbed-logger/gnunet-service-testbed-logger.c
+src/testbed-logger/testbed_logger_api.c
 src/testbed/testbed_api_barriers.c
+src/testbed/testbed_api.c
 src/testbed/testbed_api_hosts.c
 src/testbed/testbed_api_operations.c
 src/testbed/testbed_api_peers.c
 src/testbed/testbed_api_sd.c
 src/testbed/testbed_api_services.c
 src/testbed/testbed_api_statistics.c
-src/testbed/testbed_api_test.c
 src/testbed/testbed_api_testbed.c
+src/testbed/testbed_api_test.c
 src/testbed/testbed_api_topology.c
 src/testbed/testbed_api_underlay.c
 src/testing/gnunet-testing.c
@@ -383,40 +384,34 @@ src/transport/gnunet-communicator-tcp.c
 src/transport/gnunet-communicator-udp.c
 src/transport/gnunet-communicator-unix.c
 src/transport/gnunet-helper-transport-bluetooth.c
-src/transport/gnunet-helper-transport-wlan-dummy.c
 src/transport/gnunet-helper-transport-wlan.c
+src/transport/gnunet-helper-transport-wlan-dummy.c
 src/transport/gnunet-service-tng.c
-src/transport/gnunet-service-transport.c
 src/transport/gnunet-service-transport_ats.c
+src/transport/gnunet-service-transport.c
 src/transport/gnunet-service-transport_hello.c
 src/transport/gnunet-service-transport_manipulation.c
 src/transport/gnunet-service-transport_neighbours.c
 src/transport/gnunet-service-transport_plugins.c
 src/transport/gnunet-service-transport_validation.c
+src/transport/gnunet-transport.c
 src/transport/gnunet-transport-profiler.c
 src/transport/gnunet-transport-wlan-receiver.c
 src/transport/gnunet-transport-wlan-sender.c
-src/transport/gnunet-transport.c
 src/transport/plugin_transport_http_client.c
 src/transport/plugin_transport_http_common.c
 src/transport/plugin_transport_http_server.c
 src/transport/plugin_transport_smtp.c
 src/transport/plugin_transport_tcp.c
 src/transport/plugin_transport_template.c
-src/transport/plugin_transport_udp.c
 src/transport/plugin_transport_udp_broadcasting.c
+src/transport/plugin_transport_udp.c
 src/transport/plugin_transport_unix.c
 src/transport/plugin_transport_wlan.c
 src/transport/tcp_connection_legacy.c
 src/transport/tcp_server_legacy.c
 src/transport/tcp_server_mst_legacy.c
 src/transport/tcp_service_legacy.c
-src/transport/transport-testing-filenames.c
-src/transport/transport-testing-loggers.c
-src/transport/transport-testing-main.c
-src/transport/transport-testing-send.c
-src/transport/transport-testing.c
-src/transport/transport-testing2.c
 src/transport/transport_api2_application.c
 src/transport/transport_api2_communication.c
 src/transport/transport_api2_core.c
@@ -429,6 +424,12 @@ src/transport/transport_api_manipulation.c
 src/transport/transport_api_monitor_peers.c
 src/transport/transport_api_monitor_plugins.c
 src/transport/transport_api_offer_hello.c
+src/transport/transport-testing2.c
+src/transport/transport-testing.c
+src/transport/transport-testing-filenames.c
+src/transport/transport-testing-loggers.c
+src/transport/transport-testing-main.c
+src/transport/transport-testing-send.c
 src/util/bandwidth.c
 src/util/benchmark.c
 src/util/bio.c
@@ -443,8 +444,8 @@ src/util/consttime_memcmp.c
 src/util/container_bloomfilter.c
 src/util/container_heap.c
 src/util/container_meta_data.c
-src/util/container_multihashmap.c
 src/util/container_multihashmap32.c
+src/util/container_multihashmap.c
 src/util/container_multipeermap.c
 src/util/container_multishortmap.c
 src/util/container_multiuuidmap.c
@@ -468,8 +469,8 @@ src/util/dnsparser.c
 src/util/dnsstub.c
 src/util/getopt.c
 src/util/getopt_helpers.c
-src/util/gnunet-config-diff.c
 src/util/gnunet-config.c
+src/util/gnunet-config-diff.c
 src/util/gnunet-crypto-tvg.c
 src/util/gnunet-ecc.c
 src/util/gnunet-qr.c
@@ -506,8 +507,8 @@ src/vpn/gnunet-helper-vpn.c
 src/vpn/gnunet-service-vpn.c
 src/vpn/gnunet-vpn.c
 src/vpn/vpn_api.c
-src/zonemaster/gnunet-service-zonemaster-monitor.c
 src/zonemaster/gnunet-service-zonemaster.c
+src/zonemaster/gnunet-service-zonemaster-monitor.c
 src/fs/fs_api.h
 src/testbed/testbed_api.h
 src/testbed/testbed_api_operations.h
diff --git a/po/de.po b/po/de.po
index 0257436d6..9904529c6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2020-02-13 20:41+0100\n"
+"POT-Creation-Date: 2020-07-07 12:22+0200\n"
 "PO-Revision-Date: 2015-03-08 16:16+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -21,124 +21,124 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.7.4\n"
 
-#: src/abd/gnunet-abd.c:397 src/namestore/gnunet-namestore.c:1271
+#: src/abd/gnunet-abd.c:397 src/namestore/gnunet-namestore.c:1302
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "`%s': unbekannter Dienst: %s\n"
 
-#: src/abd/gnunet-abd.c:413 src/abd/gnunet-abd.c:886
+#: src/abd/gnunet-abd.c:413 src/abd/gnunet-abd.c:896
 #, c-format
 msgid "Issuer public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1747
+#: src/abd/gnunet-abd.c:560 src/abd/gnunet-service-abd.c:1747
 #: src/namestore/gnunet-namestore.c:1001
-#: src/namestore/gnunet-namestore-fcfsd.c:1153
+#: src/namestore/gnunet-namestore-fcfsd.c:1154
 #, fuzzy, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/abd/gnunet-abd.c:825 src/abd/gnunet-abd.c:876
+#: src/abd/gnunet-abd.c:835 src/abd/gnunet-abd.c:886
 #, fuzzy, c-format
 msgid "Issuer public key not well-formed\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/abd/gnunet-abd.c:834 src/abd/gnunet-abd.c:895
+#: src/abd/gnunet-abd.c:844 src/abd/gnunet-abd.c:905
 #, fuzzy, c-format
 msgid "Failed to connect to ABD\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/abd/gnunet-abd.c:840
+#: src/abd/gnunet-abd.c:850
 #, c-format
 msgid "You must provide issuer the attribute\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:847
+#: src/abd/gnunet-abd.c:857
 #, fuzzy, c-format
 msgid "ego required\n"
 msgstr "Gültiger Typ ist erforderlich\n"
 
-#: src/abd/gnunet-abd.c:857
+#: src/abd/gnunet-abd.c:867
 #, c-format
 msgid "Subject public key needed\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:866
+#: src/abd/gnunet-abd.c:876
 #, c-format
 msgid "Subject public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:901
+#: src/abd/gnunet-abd.c:911
 #, c-format
 msgid "You must provide issuer and subject attributes\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:957
+#: src/abd/gnunet-abd.c:970
 #, c-format
 msgid "Please specify name to lookup, subject key and issuer key!\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:978
+#: src/abd/gnunet-abd.c:991
 msgid "verify credential against attribute"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:985
+#: src/abd/gnunet-abd.c:998
 #, fuzzy
 msgid ""
 "The public key of the subject to lookup thecredential for, or for issuer "
 "side storage: subject and its attributes"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/abd/gnunet-abd.c:992
+#: src/abd/gnunet-abd.c:1005
 msgid "The private, signed delegate presented by the subject"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:999
+#: src/abd/gnunet-abd.c:1012
 msgid "The public key of the authority to verify the credential against"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1004
+#: src/abd/gnunet-abd.c:1017
 msgid "The ego/zone name to use"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1010
+#: src/abd/gnunet-abd.c:1023
 msgid "The issuer attribute to verify against or to issue"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1016
+#: src/abd/gnunet-abd.c:1029
 msgid ""
 "The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1021
+#: src/abd/gnunet-abd.c:1034
 msgid "collect credentials"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1026
+#: src/abd/gnunet-abd.c:1039
 msgid "Create and issue a credential issuer side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1031
+#: src/abd/gnunet-abd.c:1044
 msgid "Issue a credential subject side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1036
+#: src/abd/gnunet-abd.c:1049
 msgid "Create, sign and return a credential subject side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1043
+#: src/abd/gnunet-abd.c:1056
 msgid "Import signed credentials that should be issued to a zone/ego"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1047
+#: src/abd/gnunet-abd.c:1060
 msgid "Create private record entry."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1053 src/abd/gnunet-abd.c:1059
+#: src/abd/gnunet-abd.c:1066 src/abd/gnunet-abd.c:1072
 msgid "Indicates that the collect/verify process is done via forward search."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1072
+#: src/abd/gnunet-abd.c:1085
 #, fuzzy
 msgid "GNUnet abd resolver tool"
 msgstr "GNUnet Netzwerk Topologie tracen."
@@ -383,28 +383,28 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:1129
 #: src/transport/plugin_transport_tcp.c:3706
 #: src/transport/tcp_service_legacy.c:594
-#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1091
-#: src/util/service.c:1097
+#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1090
+#: src/util/service.c:1096
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:452 src/transport/plugin_transport_tcp.c:1163
 #: src/transport/tcp_service_legacy.c:634 src/util/client.c:527
-#: src/util/service.c:1130
+#: src/util/service.c:1129
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:456 src/transport/plugin_transport_tcp.c:1167
 #: src/transport/tcp_service_legacy.c:638 src/util/client.c:532
-#: src/util/service.c:1134
+#: src/util/service.c:1133
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:484 src/transport/plugin_transport_tcp.c:1195
-#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1154
+#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1153
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -412,7 +412,7 @@ msgid ""
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:505 src/transport/plugin_transport_tcp.c:1213
-#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1172
+#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1171
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
@@ -420,7 +420,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:536
 #: src/transport/plugin_transport_http_server.c:2718
 #: src/transport/plugin_transport_tcp.c:1244
-#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1203
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1202
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "»%s« konnte nicht aufgelöst werden: %s\n"
@@ -428,7 +428,7 @@ msgstr "»%s« konnte nicht aufgelöst werden: %s\n"
 #: src/arm/gnunet-service-arm.c:555
 #: src/transport/plugin_transport_http_server.c:2736
 #: src/transport/plugin_transport_tcp.c:1263
-#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1222
+#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1221
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
@@ -565,12 +565,12 @@ msgstr ""
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "SQLite Datenbank konnte nicht initialisiert werden.\n"
 
-#: src/ats/plugin_ats_proportional.c:1140
+#: src/ats/plugin_ats_proportional.c:1142
 #, fuzzy, c-format
 msgid "Invalid %s configuration %f \n"
 msgstr "Konfiguration konnte nicht aus %s geladen werden\n"
 
-#: src/ats/plugin_ats_proportional.c:1163
+#: src/ats/plugin_ats_proportional.c:1165
 #, fuzzy, c-format
 msgid "Invalid %s configuration %f\n"
 msgstr " gconfig\tGTK Konfiguration\n"
@@ -755,7 +755,7 @@ msgstr ""
 
 #: src/auction/gnunet-auction-info.c:77 src/auction/gnunet-auction-join.c:77
 #: src/conversation/gnunet-conversation-test.c:256
-#: src/revocation/gnunet-revocation.c:524 src/template/gnunet-template.c:75
+#: src/revocation/gnunet-revocation.c:552 src/template/gnunet-template.c:75
 msgid "help text"
 msgstr "Hilfetext"
 
@@ -1364,11 +1364,11 @@ msgstr ""
 msgid "# messages of type %u discarded (client busy)"
 msgstr "# Bytes Rauschen empfangen"
 
-#: src/core/gnunet-service-core.c:926
+#: src/core/gnunet-service-core.c:927
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:945
+#: src/core/gnunet-service-core.c:955
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "Dienst »%s« wird neu gestartet.\n"
@@ -1398,128 +1398,128 @@ msgstr ""
 msgid "# PING messages transmitted"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:978
+#: src/core/gnunet-service-core_kx.c:979
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:992
+#: src/core/gnunet-service-core_kx.c:993
 #, fuzzy
 msgid "# duplicate ephemeral keys ignored"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1027
+#: src/core/gnunet-service-core_kx.c:1028
 #, fuzzy
 msgid "# EPHEMERAL_KEYs rejected (bad signature)"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1045
+#: src/core/gnunet-service-core_kx.c:1046
 #, c-format
 msgid ""
 "EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match "
 "our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1052
+#: src/core/gnunet-service-core_kx.c:1053
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages rejected due to time"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1070
+#: src/core/gnunet-service-core_kx.c:1071
 #, fuzzy
 msgid "# valid ephemeral keys received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1179
+#: src/core/gnunet-service-core_kx.c:1180
 #: src/transport/gnunet-service-transport_validation.c:1133
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1189
+#: src/core/gnunet-service-core_kx.c:1190
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1238
+#: src/core/gnunet-service-core_kx.c:1239
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1263
+#: src/core/gnunet-service-core_kx.c:1264
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1276
+#: src/core/gnunet-service-core_kx.c:1277
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# Klartext PING Nachrichten gesendet"
 
-#: src/core/gnunet-service-core_kx.c:1333
-#: src/transport/gnunet-service-transport_validation.c:1475
+#: src/core/gnunet-service-core_kx.c:1334
+#: src/transport/gnunet-service-transport_validation.c:1476
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# verschlüsselter PONG Nachrichten empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1341
+#: src/core/gnunet-service-core_kx.c:1342
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1349
+#: src/core/gnunet-service-core_kx.c:1350
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1388
+#: src/core/gnunet-service-core_kx.c:1389
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING Nachrichten erstellt"
 
-#: src/core/gnunet-service-core_kx.c:1428
+#: src/core/gnunet-service-core_kx.c:1429
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1440
+#: src/core/gnunet-service-core_kx.c:1441
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# Bytes empfangen über TCP"
 
-#: src/core/gnunet-service-core_kx.c:1449
+#: src/core/gnunet-service-core_kx.c:1450
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Knotenankündigungen empfangen"
 
-#: src/core/gnunet-service-core_kx.c:1625
+#: src/core/gnunet-service-core_kx.c:1626
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1636
+#: src/core/gnunet-service-core_kx.c:1637
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1640
+#: src/core/gnunet-service-core_kx.c:1641
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1718
-#: src/core/gnunet-service-core_kx.c:1745
+#: src/core/gnunet-service-core_kx.c:1719
+#: src/core/gnunet-service-core_kx.c:1746
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1731
+#: src/core/gnunet-service-core_kx.c:1732
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1776
+#: src/core/gnunet-service-core_kx.c:1777
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# Bytes verworfen von TCP (ausgehend)"
 
-#: src/core/gnunet-service-core_kx.c:1785
+#: src/core/gnunet-service-core_kx.c:1786
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# Bytes entschlüsselt"
@@ -2732,56 +2732,56 @@ msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1141
+#: src/fs/fs_api.c:1173
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:1667
+#: src/fs/fs_api.c:1724
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1682
+#: src/fs/fs_api.c:1739
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2366
+#: src/fs/fs_api.c:2468
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2377
+#: src/fs/fs_api.c:2479
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2513 src/fs/fs_api.c:2759
+#: src/fs/fs_api.c:2627 src/fs/fs_api.c:2873
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2531
+#: src/fs/fs_api.c:2645
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_api.c:2547 src/fs/fs_api.c:2567 src/fs/fs_api.c:3058
+#: src/fs/fs_api.c:2661 src/fs/fs_api.c:2681 src/fs/fs_api.c:3180
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2749
+#: src/fs/fs_api.c:2863
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3002
+#: src/fs/fs_api.c:3124
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3097
+#: src/fs/fs_api.c:3219
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2880,17 +2880,17 @@ msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/fs_namespace.c:227
+#: src/fs/fs_namespace.c:233
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/fs/fs_namespace.c:321
+#: src/fs/fs_namespace.c:330
 #, fuzzy, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/fs/fs_namespace.c:463
+#: src/fs/fs_namespace.c:472
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden."
@@ -3121,67 +3121,67 @@ msgstr "Ungültiges Argument »%s«\n"
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:1072 src/fs/fs_uri.c:1099
+#: src/fs/fs_uri.c:1071 src/fs/fs_uri.c:1098
 msgid "No keywords specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/fs/fs_uri.c:1105
+#: src/fs/fs_uri.c:1104
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:230
+#: src/fs/gnunet-auto-share.c:234
 #, fuzzy, c-format
 msgid "Failed to load state: %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/fs/gnunet-auto-share.c:278 src/fs/gnunet-auto-share.c:287
-#: src/fs/gnunet-auto-share.c:295
+#: src/fs/gnunet-auto-share.c:286 src/fs/gnunet-auto-share.c:295
+#: src/fs/gnunet-auto-share.c:303
 #, fuzzy, c-format
 msgid "Failed to save state to file %s\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/fs/gnunet-auto-share.c:392
+#: src/fs/gnunet-auto-share.c:400
 #, c-format
 msgid "Publication of `%s' done\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:471
+#: src/fs/gnunet-auto-share.c:479
 #, c-format
 msgid "Publishing `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:483
+#: src/fs/gnunet-auto-share.c:491
 #, fuzzy, c-format
 msgid "Failed to run `%s'\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/fs/gnunet-auto-share.c:653
+#: src/fs/gnunet-auto-share.c:661
 #, fuzzy, c-format
 msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Sie dürfen nur eine Datei zum Deindizieren angeben.\n"
 
-#: src/fs/gnunet-auto-share.c:703 src/fs/gnunet-publish.c:888
+#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:888
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "Gewünschten Grad LEVEL an Sender-Anonymität festlegen"
 
-#: src/fs/gnunet-auto-share.c:710
+#: src/fs/gnunet-auto-share.c:718
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:716 src/fs/gnunet-publish.c:893
+#: src/fs/gnunet-auto-share.c:724 src/fs/gnunet-publish.c:893
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:723 src/fs/gnunet-publish.c:938
+#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:938
 msgid "specify the priority of the content"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/fs/gnunet-auto-share.c:730 src/fs/gnunet-publish.c:951
+#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:951
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:753
+#: src/fs/gnunet-auto-share.c:761
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
@@ -3618,7 +3618,7 @@ msgstr ""
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/fs/gnunet-service-fs.c:1307 src/hostlist/gnunet-daemon-hostlist.c:355
+#: src/fs/gnunet-service-fs.c:1316 src/hostlist/gnunet-daemon-hostlist.c:343
 #: src/topology/gnunet-daemon-topology.c:1098
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
@@ -3740,41 +3740,41 @@ msgid "# migration stop messages sent"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
 #: src/fs/gnunet-service-fs_indexing.c:130
-#: src/fs/gnunet-service-fs_indexing.c:185
+#: src/fs/gnunet-service-fs_indexing.c:188
 #, fuzzy, c-format
 msgid "Could not open `%s'.\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:144
+#: src/fs/gnunet-service-fs_indexing.c:147
 #, fuzzy, c-format
 msgid "Error writing `%s'.\n"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/fs/gnunet-service-fs_indexing.c:241
+#: src/fs/gnunet-service-fs_indexing.c:244
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Datei wurde als `%s' gespeichert.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:314
+#: src/fs/gnunet-service-fs_indexing.c:317
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:328
+#: src/fs/gnunet-service-fs_indexing.c:331
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "Datei `%s' konnte nicht dekodiert werden bei %s:%d.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:332
+#: src/fs/gnunet-service-fs_indexing.c:335
 #, fuzzy
 msgid "not indexed"
 msgstr "Deindizierung schlug fehl."
 
-#: src/fs/gnunet-service-fs_indexing.c:346
+#: src/fs/gnunet-service-fs_indexing.c:349
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "FSUI Statusdatei `%s' hatte einen Syntaxfehler bei Offset %u.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:452
+#: src/fs/gnunet-service-fs_indexing.c:455
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3962,67 +3962,67 @@ msgstr ""
 msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:132
+#: src/gns/gnunet-bcd.c:133
 #, fuzzy, c-format
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/gns/gnunet-bcd.c:346
+#: src/gns/gnunet-bcd.c:347
 #, fuzzy, c-format
 msgid "Invalid port number %u.  Exiting.\n"
 msgstr "Ungültige Parameter. Abbruch.\n"
 
-#: src/gns/gnunet-bcd.c:351
+#: src/gns/gnunet-bcd.c:352
 #, fuzzy, c-format
 msgid "Businesscard HTTP server starts on %u\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/gns/gnunet-bcd.c:371
+#: src/gns/gnunet-bcd.c:372
 #, fuzzy, c-format
 msgid "Could not start businesscard HTTP server on port %u\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/gns/gnunet-bcd.c:508
+#: src/gns/gnunet-bcd.c:509
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:521
+#: src/gns/gnunet-bcd.c:522
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:213
+#: src/gns/gnunet-dns2gns.c:239
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:418
+#: src/gns/gnunet-dns2gns.c:442
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:434
+#: src/gns/gnunet-dns2gns.c:458
 #, fuzzy, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Beschädigte Antwort auf `%s' von Knoten `%s' empfangen.\n"
 
-#: src/gns/gnunet-dns2gns.c:442
+#: src/gns/gnunet-dns2gns.c:466
 #, fuzzy, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Unbekannte Anfrageart %d empfangen bei %s:%d\n"
 
-#: src/gns/gnunet-dns2gns.c:603
+#: src/gns/gnunet-dns2gns.c:627
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Keine Schlüsselwörter angegeben!\n"
 
-#: src/gns/gnunet-dns2gns.c:752
+#: src/gns/gnunet-dns2gns.c:776
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:758
+#: src/gns/gnunet-dns2gns.c:782
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:775
+#: src/gns/gnunet-dns2gns.c:799
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -4163,44 +4163,44 @@ msgstr "SQLite Datenbank konnte nicht initialisiert werden: %s.\n"
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2922 src/rest/gnunet-rest-server.c:709
+#: src/gns/gnunet-gns-proxy.c:2922 src/rest/gnunet-rest-server.c:713
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Fehler beim Starten der Collection.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3268
+#: src/gns/gnunet-gns-proxy.c:3271
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3300
+#: src/gns/gnunet-gns-proxy.c:3303
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3386
+#: src/gns/gnunet-gns-proxy.c:3389
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3727
+#: src/gns/gnunet-gns-proxy.c:3730
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/gns/gnunet-gns-proxy.c:3861
+#: src/gns/gnunet-gns-proxy.c:3864
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3866
+#: src/gns/gnunet-gns-proxy.c:3869
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3870
+#: src/gns/gnunet-gns-proxy.c:3873
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3896
+#: src/gns/gnunet-gns-proxy.c:3899
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -4246,51 +4246,51 @@ msgstr ""
 msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:932
+#: src/gns/gnunet-service-gns_resolver.c:938
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1123
+#: src/gns/gnunet-service-gns_resolver.c:1129
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1439
+#: src/gns/gnunet-service-gns_resolver.c:1447
 #, c-format
 msgid "VPN returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1896
+#: src/gns/gnunet-service-gns_resolver.c:1909
 #, c-format
 msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1909
+#: src/gns/gnunet-service-gns_resolver.c:1922
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1952
+#: src/gns/gnunet-service-gns_resolver.c:1965
 #, fuzzy, c-format
 msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr "Dienst `%s' konnte nicht ordentlich entladen werden!\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2372
+#: src/gns/gnunet-service-gns_resolver.c:2385
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2395
+#: src/gns/gnunet-service-gns_resolver.c:2408
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2563
+#: src/gns/gnunet-service-gns_resolver.c:2576
 #, c-format
 msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2703
+#: src/gns/gnunet-service-gns_resolver.c:2716
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
@@ -4320,7 +4320,7 @@ msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/gns/plugin_rest_gns.c:443
+#: src/gns/plugin_rest_gns.c:445
 #, fuzzy
 msgid "Gns REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -4469,31 +4469,31 @@ msgstr ""
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:316
+#: src/hostlist/gnunet-daemon-hostlist.c:306
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:377
+#: src/hostlist/gnunet-daemon-hostlist.c:364
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:383
+#: src/hostlist/gnunet-daemon-hostlist.c:369
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:388
+#: src/hostlist/gnunet-daemon-hostlist.c:374
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:393
+#: src/hostlist/gnunet-daemon-hostlist.c:378
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:409
+#: src/hostlist/gnunet-daemon-hostlist.c:393
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -4519,7 +4519,7 @@ msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# Hellos per HTTP heruntergeladen"
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:677
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1455
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1459
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -4570,7 +4570,7 @@ msgid "# hostlist downloads initiated"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1144
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1715
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1726
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
@@ -4601,67 +4601,67 @@ msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 "`%s' konnte nicht aufgelöst werden, um unsere IP-Adresse zu ermitteln: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1448
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1452
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1451
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1455
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1502
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1506
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 "Datei `%s' konnte nicht zu `%s' umbenannt werden: Datei existiert bereits\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1509
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1513
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1534
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1553
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1545
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1564
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1547
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1558
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1644
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1655
 #: src/transport/plugin_transport_http_client.c:2301
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1673
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1684
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1686
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1697
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1700
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1711
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:172
+#: src/hostlist/gnunet-daemon-hostlist_server.c:173
 #, fuzzy
 msgid "bytes in hostlist"
 msgstr "# bytes in der Datenbank"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:198
+#: src/hostlist/gnunet-daemon-hostlist_server.c:199
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:235
-#: src/hostlist/gnunet-daemon-hostlist_server.c:526
+#: src/hostlist/gnunet-daemon-hostlist_server.c:236
+#: src/hostlist/gnunet-daemon-hostlist_server.c:527
 #: src/peerinfo-tool/gnunet-peerinfo.c:379
 #: src/peerinfo-tool/gnunet-peerinfo.c:515
 #: src/topology/gnunet-daemon-topology.c:799
@@ -4669,196 +4669,201 @@ msgstr ""
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Informationen über andere GNUnet Knoten ausgeben."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:256
+#: src/hostlist/gnunet-daemon-hostlist_server.c:257
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:274
+#: src/hostlist/gnunet-daemon-hostlist_server.c:275
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:376
+#: src/hostlist/gnunet-daemon-hostlist_server.c:377
 #, fuzzy, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:380
+#: src/hostlist/gnunet-daemon-hostlist_server.c:381
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:393
+#: src/hostlist/gnunet-daemon-hostlist_server.c:394
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:398
+#: src/hostlist/gnunet-daemon-hostlist_server.c:399
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:408
+#: src/hostlist/gnunet-daemon-hostlist_server.c:409
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:411
+#: src/hostlist/gnunet-daemon-hostlist_server.c:412
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:417
+#: src/hostlist/gnunet-daemon-hostlist_server.c:418
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:419
+#: src/hostlist/gnunet-daemon-hostlist_server.c:420
 #, fuzzy
 msgid "hostlist requests processed"
 msgstr "# dht Anfragen weitergeleitet"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:460
+#: src/hostlist/gnunet-daemon-hostlist_server.c:461
 #, fuzzy
 msgid "# hostlist advertisements send"
 msgstr "# Bekanntmachungen von anderen übertragen"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:673
-#: src/transport/gnunet-service-transport.c:2657
+#: src/hostlist/gnunet-daemon-hostlist_server.c:674
+#: src/transport/gnunet-service-transport.c:2659
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Auf die Namespace Informationen konnte nicht zugegriffen werden.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:684
+#: src/hostlist/gnunet-daemon-hostlist_server.c:685
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Ungültige Parameter. Abbruch.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:696
+#: src/hostlist/gnunet-daemon-hostlist_server.c:697
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:713
+#: src/hostlist/gnunet-daemon-hostlist_server.c:714
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:728
+#: src/hostlist/gnunet-daemon-hostlist_server.c:729
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:742
+#: src/hostlist/gnunet-daemon-hostlist_server.c:743
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:764
+#: src/hostlist/gnunet-daemon-hostlist_server.c:765
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "»%s« ist keine gültige IP-Adresse.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:785
+#: src/hostlist/gnunet-daemon-hostlist_server.c:786
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "»%s« ist keine gültige IP-Adresse.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:828
+#: src/hostlist/gnunet-daemon-hostlist_server.c:829
 #, fuzzy, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr "Der Transportdienst auf Port %d konnte nicht gestartet werden.\n"
 
-#: src/identity/gnunet-identity.c:193
+#: src/identity/gnunet-identity.c:209
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/identity/gnunet-identity.c:233
+#: src/identity/gnunet-identity.c:250
 #, fuzzy, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
 
-#: src/identity/gnunet-identity.c:391
+#: src/identity/gnunet-identity.c:445
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:396
+#: src/identity/gnunet-identity.c:450
 msgid "delete ego NAME "
 msgstr ""
 
-#: src/identity/gnunet-identity.c:400
+#: src/identity/gnunet-identity.c:455
+msgid ""
+"set the private key for the identity to PRIVATE_KEY (use together with -C)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:459
 msgid "display all egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:404
+#: src/identity/gnunet-identity.c:463
 #, fuzzy
 msgid "reduce output"
 msgstr "Ausführliche Ausgabe"
 
-#: src/identity/gnunet-identity.c:411
+#: src/identity/gnunet-identity.c:470
 msgid ""
 "set default identity to NAME for a subsystem SUBSYSTEM (use together with -"
 "s) or restrict results to NAME (use together with -d)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:415
+#: src/identity/gnunet-identity.c:474
 msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:419
+#: src/identity/gnunet-identity.c:478
 msgid "display private keys as well"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:426
+#: src/identity/gnunet-identity.c:485
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:438
+#: src/identity/gnunet-identity.c:500
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:484
+#: src/identity/gnunet-service-identity.c:503
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:507
+#: src/identity/gnunet-service-identity.c:528
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:597
-#: src/identity/gnunet-service-identity.c:871
-#: src/identity/gnunet-service-identity.c:991
+#: src/identity/gnunet-service-identity.c:621
+#: src/identity/gnunet-service-identity.c:898
+#: src/identity/gnunet-service-identity.c:1018
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/identity/gnunet-service-identity.c:607
+#: src/identity/gnunet-service-identity.c:631
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:700
+#: src/identity/gnunet-service-identity.c:726
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:847
+#: src/identity/gnunet-service-identity.c:874
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:889
-#: src/identity/gnunet-service-identity.c:1009
+#: src/identity/gnunet-service-identity.c:916
+#: src/identity/gnunet-service-identity.c:1035
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:1043
+#: src/identity/gnunet-service-identity.c:1072
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Fehler beim Parsen der Gerätedaten von `%s' bei %s:%d.\n"
 
-#: src/identity/gnunet-service-identity.c:1099
+#: src/identity/gnunet-service-identity.c:1130
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei `%s':"
 
-#: src/identity/gnunet-service-identity.c:1108
+#: src/identity/gnunet-service-identity.c:1139
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 
-#: src/identity/plugin_rest_identity.c:1359
+#: src/identity/plugin_rest_identity.c:1406
 msgid "Identity REST API initialized\n"
 msgstr ""
 
@@ -4907,7 +4912,7 @@ msgstr "Ungültiger Parameter: `%s'\n"
 msgid "You must specify a name\n"
 msgstr "Sie müssen einen Empfänger angeben!\n"
 
-#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:1608
+#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:1639
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -4916,7 +4921,7 @@ msgstr ""
 msgid "specifies the public key of the zone to look in"
 msgstr "Die Priorität des Inhalts angeben"
 
-#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:1669
+#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:1700
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet Konfiguration"
@@ -5025,9 +5030,10 @@ msgstr "Dateiformat fehlerhaft (kein GNUnet Verzeichnis?)\n"
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1014 src/namestore/gnunet-namestore.c:1047
-#: src/namestore/gnunet-namestore.c:1057 src/namestore/gnunet-namestore.c:1075
-#: src/namestore/gnunet-namestore.c:1096 src/namestore/gnunet-namestore.c:1123
+#: src/namestore/gnunet-namestore.c:1014 src/namestore/gnunet-namestore.c:1065
+#: src/namestore/gnunet-namestore.c:1075 src/namestore/gnunet-namestore.c:1104
+#: src/namestore/gnunet-namestore.c:1125 src/namestore/gnunet-namestore.c:1152
+#: src/namestore/gnunet-namestore.c:1228
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Unbekannte Operation `%s'\n"
@@ -5036,52 +5042,58 @@ msgstr "Unbekannte Operation `%s'\n"
 msgid "replace"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1049 src/namestore/gnunet-namestore.c:1059
-#: src/namestore/gnunet-namestore.c:1077 src/namestore/gnunet-namestore.c:1098
+#: src/namestore/gnunet-namestore.c:1045
+#, fuzzy, c-format
+msgid "Invalid nick `%s'\n"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/namestore/gnunet-namestore.c:1067 src/namestore/gnunet-namestore.c:1077
+#: src/namestore/gnunet-namestore.c:1106 src/namestore/gnunet-namestore.c:1127
+#: src/namestore/gnunet-namestore.c:1230
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1067
+#: src/namestore/gnunet-namestore.c:1085
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/namestore/gnunet-namestore.c:1086
+#: src/namestore/gnunet-namestore.c:1095
+#, c-format
+msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1115
 #, fuzzy, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "%s: Symbolwert `%s' ist ungültig für %s\n"
 
-#: src/namestore/gnunet-namestore.c:1105
+#: src/namestore/gnunet-namestore.c:1134 src/namestore/gnunet-namestore.c:1237
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:1125
+#: src/namestore/gnunet-namestore.c:1154
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1168
+#: src/namestore/gnunet-namestore.c:1197
 #, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1191
+#: src/namestore/gnunet-namestore.c:1220
 #: src/peerinfo-tool/gnunet-peerinfo.c:736
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ungültiger Parameter: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:1217
-#, fuzzy, c-format
-msgid "Invalid nick `%s'\n"
-msgstr "Ungültiger Parameter: `%s'\n"
-
-#: src/namestore/gnunet-namestore.c:1259
+#: src/namestore/gnunet-namestore.c:1290
 #, c-format
 msgid "Label `%s' contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1309
+#: src/namestore/gnunet-namestore.c:1340
 #, c-format
 msgid ""
 "No default identity configured for `namestore' subsystem\n"
@@ -5089,163 +5101,163 @@ msgid ""
 "Run gnunet-identity -d to get a list of choices for $NAME\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1374
+#: src/namestore/gnunet-namestore.c:1405
 #, c-format
 msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1403
+#: src/namestore/gnunet-namestore.c:1434
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "Verbindung zu %u.%u.%u.%u:%u fehlgeschlagen: %s\n"
 
-#: src/namestore/gnunet-namestore.c:1450
+#: src/namestore/gnunet-namestore.c:1481
 msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1462
+#: src/namestore/gnunet-namestore.c:1493
 #, c-format
 msgid "Invalid expiration time `%s' (must be without unit)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1474 src/namestore/gnunet-namestore.c:1490
-#: src/namestore/gnunet-namestore.c:1507
+#: src/namestore/gnunet-namestore.c:1505 src/namestore/gnunet-namestore.c:1521
+#: src/namestore/gnunet-namestore.c:1538
 #, fuzzy, c-format
 msgid "Missing entries in record line `%s'.\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/namestore/gnunet-namestore.c:1482
+#: src/namestore/gnunet-namestore.c:1513
 #, fuzzy, c-format
 msgid "Unknown record type `%s'\n"
 msgstr "Unbekannter Befehl »%s«\n"
 
-#: src/namestore/gnunet-namestore.c:1520
+#: src/namestore/gnunet-namestore.c:1551
 #, fuzzy, c-format
 msgid "Invalid record data for type %s: `%s'.\n"
 msgstr "Ungültiges Format für IP: »%s«\n"
 
-#: src/namestore/gnunet-namestore.c:1577
+#: src/namestore/gnunet-namestore.c:1608
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1580
+#: src/namestore/gnunet-namestore.c:1611
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1584
+#: src/namestore/gnunet-namestore.c:1615
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1591
+#: src/namestore/gnunet-namestore.c:1622
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1597
+#: src/namestore/gnunet-namestore.c:1628
 msgid "set the desired nick name for the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1602
+#: src/namestore/gnunet-namestore.c:1633
 msgid "monitor changes in the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1614
+#: src/namestore/gnunet-namestore.c:1645
 msgid "determine our name for the given PKEY"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1621
+#: src/namestore/gnunet-namestore.c:1652
 msgid ""
 "set record set to values given by (possibly multiple) RECORDLINES; can be "
 "specified multiple times"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1627
+#: src/namestore/gnunet-namestore.c:1658
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1632
+#: src/namestore/gnunet-namestore.c:1663
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1638
+#: src/namestore/gnunet-namestore.c:1669
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1642
+#: src/namestore/gnunet-namestore.c:1673
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1648
+#: src/namestore/gnunet-namestore.c:1679
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1654
+#: src/namestore/gnunet-namestore.c:1685
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:551
+#: src/namestore/gnunet-namestore-fcfsd.c:552
 #, fuzzy, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "Kommando `%s' wird nicht unterstützt. Vorgang wird abgebrochen.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:578
+#: src/namestore/gnunet-namestore-fcfsd.c:579
 #, fuzzy, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:599
+#: src/namestore/gnunet-namestore-fcfsd.c:600
 msgid "Error when mapping zone to name\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:631
+#: src/namestore/gnunet-namestore-fcfsd.c:632
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:693
+#: src/namestore/gnunet-namestore-fcfsd.c:694
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:783
+#: src/namestore/gnunet-namestore-fcfsd.c:784
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:802
+#: src/namestore/gnunet-namestore-fcfsd.c:803
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "Fehler beim Aktualisieren der Daten des Moduls `%s'\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:839
+#: src/namestore/gnunet-namestore-fcfsd.c:840
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:848
+#: src/namestore/gnunet-namestore-fcfsd.c:849
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1083
+#: src/namestore/gnunet-namestore-fcfsd.c:1084
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1114
+#: src/namestore/gnunet-namestore-fcfsd.c:1115
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Fehler beim Senden einer `%s' Anfrage an den SMTP Server.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1162
+#: src/namestore/gnunet-namestore-fcfsd.c:1163
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1189
+#: src/namestore/gnunet-namestore-fcfsd.c:1190
 msgid "name of the zone that is to be managed by FCFSD"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1209
+#: src/namestore/gnunet-namestore-fcfsd.c:1210
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
@@ -5281,7 +5293,7 @@ msgstr ""
 msgid "Flat file database running\n"
 msgstr "Sqlite-Datenbank läuft\n"
 
-#: src/namestore/plugin_rest_namestore.c:925
+#: src/namestore/plugin_rest_namestore.c:1093
 #, fuzzy
 msgid "Namestore REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -5599,8 +5611,8 @@ msgstr ""
 msgid "Measure quality and performance of the NSE service."
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1437
-#: src/revocation/gnunet-service-revocation.c:846 src/util/gnunet-scrypt.c:247
+#: src/nse/gnunet-service-nse.c:1438
+#: src/revocation/gnunet-service-revocation.c:842 src/util/gnunet-scrypt.c:250
 msgid "Value is too large.\n"
 msgstr ""
 
@@ -5672,7 +5684,7 @@ msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:292
-#: src/peerinfo-tool/plugin_rest_peerinfo.c:499
+#: src/peerinfo-tool/plugin_rest_peerinfo.c:501
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "Adresse des Knotens `%s' konnte nicht ermittelt werden.\n"
@@ -5752,7 +5764,7 @@ msgstr "Teste Transport(e) %s\n"
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/peerinfo-tool/plugin_rest_peerinfo.c:795
+#: src/peerinfo-tool/plugin_rest_peerinfo.c:797
 #, fuzzy
 msgid "Peerinfo REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -5866,84 +5878,96 @@ msgstr ""
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:617
+#: src/reclaim/gnunet-reclaim.c:799
 #, fuzzy, c-format
 msgid "Ego is required\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/reclaim/gnunet-reclaim.c:624
+#: src/reclaim/gnunet-reclaim.c:806
 #, c-format
 msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:631
+#: src/reclaim/gnunet-reclaim.c:813
 #, fuzzy, c-format
 msgid "Requesting party key is required!\n"
 msgstr "Option `%s' macht keinen Sinn ohne die Option `%s'.\n"
 
-#: src/reclaim/gnunet-reclaim.c:649
+#: src/reclaim/gnunet-reclaim.c:831
 msgid "Add an attribute NAME"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:654
+#: src/reclaim/gnunet-reclaim.c:836
 msgid "Delete the attribute with ID"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:659
+#: src/reclaim/gnunet-reclaim.c:841
 msgid "The attribute VALUE"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:664
+#: src/reclaim/gnunet-reclaim.c:846
 msgid "The EGO to use"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:670
+#: src/reclaim/gnunet-reclaim.c:852
 msgid "Specify the relying party for issue"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:674
+#: src/reclaim/gnunet-reclaim.c:856
 msgid "List attributes for EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:681
+#: src/reclaim/gnunet-reclaim.c:860
+msgid "List attestations for EGO"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:866
+msgid "Attestation to use for attribute"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:871
+msgid "Attestation name"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:877
 msgid "Issue a ticket for a set of attributes separated by comma"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:686
+#: src/reclaim/gnunet-reclaim.c:882
 msgid "Consume a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:691
+#: src/reclaim/gnunet-reclaim.c:887
 msgid "Revoke a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:696
+#: src/reclaim/gnunet-reclaim.c:892
 msgid "Type of attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:700
+#: src/reclaim/gnunet-reclaim.c:896
 msgid "List tickets of ego"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:706
+#: src/reclaim/gnunet-reclaim.c:902
 msgid "Expiration interval of the attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:714
+#: src/reclaim/gnunet-reclaim.c:910
 msgid "re:claimID command line tool"
 msgstr ""
 
-#: src/reclaim/plugin_rest_openid_connect.c:2340
+#: src/reclaim/plugin_rest_openid_connect.c:2481
 #, fuzzy
 msgid "OpenID Connect REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/reclaim/plugin_rest_reclaim.c:1899
+#: src/reclaim/plugin_rest_reclaim.c:1476
 #, fuzzy
 msgid "Identity Provider REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/reclaim/reclaim_api.c:436
+#: src/reclaim/reclaim_api.c:540
 #, fuzzy
 msgid "failed to store record\n"
 msgstr "Zustellung der Nachricht `%s' fehlgeschlagen.\n"
@@ -6032,12 +6056,12 @@ msgstr ""
 msgid "Search string `%s' is too long!\n"
 msgstr "Dienst »%s« läuft nicht\n"
 
-#: src/rest/gnunet-rest-server.c:1047
+#: src/rest/gnunet-rest-server.c:1051
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "GNUnet Netzwerk Topologie tracen."
 
-#: src/rest/plugin_rest_config.c:401
+#: src/rest/plugin_rest_config.c:402
 #, fuzzy
 msgid "CONFIG REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
@@ -6047,136 +6071,154 @@ msgstr " Verbindung fehlgeschlagen\n"
 msgid "COPYING REST API initialized\n"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/revocation/gnunet-revocation.c:127
+#: src/revocation/gnunet-revocation.c:114
+#, fuzzy
+msgid "Shutting down...\n"
+msgstr "%s wird gestartet …\n"
+
+#: src/revocation/gnunet-revocation.c:146
 #, c-format
 msgid "Key `%s' is valid\n"
 msgstr "Schlüssel »%s« ist gültig\n"
 
-#: src/revocation/gnunet-revocation.c:131
+#: src/revocation/gnunet-revocation.c:150
 #, c-format
 msgid "Key `%s' has been revoked\n"
 msgstr "Schlüssel »%s« wurde widerrufen\n"
 
-#: src/revocation/gnunet-revocation.c:135
+#: src/revocation/gnunet-revocation.c:154
 msgid "Internal error\n"
 msgstr "Interner Fehler\n"
 
-#: src/revocation/gnunet-revocation.c:161
+#: src/revocation/gnunet-revocation.c:180
 #, c-format
 msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:164
+#: src/revocation/gnunet-revocation.c:183
 msgid "Revocation failed (!)\n"
 msgstr "Widerruf fehlgeschlagen (!)\n"
 
-#: src/revocation/gnunet-revocation.c:170
+#: src/revocation/gnunet-revocation.c:189
 #, c-format
 msgid "Key for ego `%s' has been successfully revoked\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:173
+#: src/revocation/gnunet-revocation.c:192
 msgid "Revocation successful.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:179
+#: src/revocation/gnunet-revocation.c:198
 msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:312
+#: src/revocation/gnunet-revocation.c:251
+msgid "Cancelling calculation.\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:296
 #, c-format
 msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:338
+#: src/revocation/gnunet-revocation.c:335
 #, fuzzy, c-format
 msgid "Ego `%s' not found.\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/revocation/gnunet-revocation.c:351
+#: src/revocation/gnunet-revocation.c:349
 #, c-format
 msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:368
+#: src/revocation/gnunet-revocation.c:359
 msgid "Revocation certificate ready\n"
 msgstr ""
 
+#: src/revocation/gnunet-revocation.c:371
+msgid "Continuing calculation where left off...\n"
+msgstr ""
+
 #: src/revocation/gnunet-revocation.c:378
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:409
+#: src/revocation/gnunet-revocation.c:416
 #, c-format
 msgid "Public key `%s' malformed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:419
+#: src/revocation/gnunet-revocation.c:426
 msgid ""
 "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:438
+#: src/revocation/gnunet-revocation.c:456
 msgid "No filename to store revocation certificate given.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:451
+#: src/revocation/gnunet-revocation.c:471
 #, fuzzy, c-format
 msgid "Failed to read revocation certificate from `%s'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/revocation/gnunet-revocation.c:471
+#: src/revocation/gnunet-revocation.c:493
 #, fuzzy
 msgid "No action specified. Nothing to do.\n"
 msgstr "Keine Kommandos angegeben.\n"
 
-#: src/revocation/gnunet-revocation.c:490
+#: src/revocation/gnunet-revocation.c:512
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:498
+#: src/revocation/gnunet-revocation.c:520
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:505
+#: src/revocation/gnunet-revocation.c:527
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:512
+#: src/revocation/gnunet-revocation.c:534
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:458
+#: src/revocation/gnunet-revocation.c:540
+#, fuzzy
+msgid "number of epochs to calculate for"
+msgstr "Anzahl an Durchläufen"
+
+#: src/revocation/gnunet-service-revocation.c:454
 msgid "# unsupported revocations received via set union"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:468
+#: src/revocation/gnunet-service-revocation.c:464
 #, fuzzy
 msgid "# revocation messages received via set union"
 msgstr "# verschlüsselter PING Nachrichten empfangen"
 
-#: src/revocation/gnunet-service-revocation.c:474
+#: src/revocation/gnunet-service-revocation.c:470
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:478
+#: src/revocation/gnunet-service-revocation.c:474
 #, fuzzy
 msgid "# revocation set unions failed"
 msgstr " Verbindung fehlgeschlagen\n"
 
-#: src/revocation/gnunet-service-revocation.c:490
+#: src/revocation/gnunet-service-revocation.c:486
 #, fuzzy
 msgid "# revocation set unions completed"
 msgstr "# Klartext PONG Nachrichten empfangen"
 
-#: src/revocation/gnunet-service-revocation.c:530
+#: src/revocation/gnunet-service-revocation.c:526
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:871
+#: src/revocation/gnunet-service-revocation.c:881
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
@@ -6365,93 +6407,93 @@ msgstr "Dateien aus dem GNUnet herunterladen."
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Dateien aus dem GNUnet herunterladen."
 
-#: src/statistics/gnunet-statistics.c:409
-#: src/statistics/gnunet-statistics.c:448
+#: src/statistics/gnunet-statistics.c:413
+#: src/statistics/gnunet-statistics.c:455
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Statistiken über den Netzwerkverkehr konnten nicht ermittelt werden.\n"
 
-#: src/statistics/gnunet-statistics.c:412
-#: src/statistics/gnunet-statistics.c:451
+#: src/statistics/gnunet-statistics.c:416
+#: src/statistics/gnunet-statistics.c:458
 #, fuzzy, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
 
-#: src/statistics/gnunet-statistics.c:526
+#: src/statistics/gnunet-statistics.c:532
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:532
+#: src/statistics/gnunet-statistics.c:538
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:571
+#: src/statistics/gnunet-statistics.c:577
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:583
+#: src/statistics/gnunet-statistics.c:589
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "`%s' Dienst konnte nicht initialisiert werden.\n"
 
-#: src/statistics/gnunet-statistics.c:710
+#: src/statistics/gnunet-statistics.c:725
 #, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Ungültiges Argument »%s«\n"
 
-#: src/statistics/gnunet-statistics.c:726
+#: src/statistics/gnunet-statistics.c:742
 #, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:735
+#: src/statistics/gnunet-statistics.c:751
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:764
+#: src/statistics/gnunet-statistics.c:783
 #, c-format
 msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:797
+#: src/statistics/gnunet-statistics.c:816
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:803
+#: src/statistics/gnunet-statistics.c:821
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:810
+#: src/statistics/gnunet-statistics.c:827
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:816
+#: src/statistics/gnunet-statistics.c:832
 msgid "use as csv separator"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:823
+#: src/statistics/gnunet-statistics.c:838
 msgid "path to the folder containing the testbed data"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:829
+#: src/statistics/gnunet-statistics.c:843
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:834
+#: src/statistics/gnunet-statistics.c:847
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:840
+#: src/statistics/gnunet-statistics.c:852
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:846
+#: src/statistics/gnunet-statistics.c:857
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:861
+#: src/statistics/gnunet-statistics.c:874
 msgid "Print statistics about GNUnet operations."
 msgstr "Statistiken der GNUnet-Aktivitäten ausgeben."
 
@@ -6542,7 +6584,7 @@ msgid ""
 msgstr ""
 
 #: src/testbed/gnunet-daemon-testbed-underlay.c:234 src/testing/list-keys.c:47
-#: src/testing/testing.c:284 src/util/gnunet-ecc.c:292
+#: src/testing/testing.c:284 src/util/gnunet-ecc.c:318
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
@@ -6927,39 +6969,39 @@ msgstr "# HELLO-Meldungen empfangen"
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:2227
-#: src/transport/gnunet-communicator-udp.c:2712
-#: src/transport/gnunet-service-tng.c:10024
-#: src/transport/gnunet-service-transport.c:2627
+#: src/transport/gnunet-communicator-tcp.c:2458
+#: src/transport/gnunet-communicator-udp.c:2825
+#: src/transport/gnunet-service-tng.c:10027
+#: src/transport/gnunet-service-transport.c:2624
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:2285
+#: src/transport/gnunet-communicator-tcp.c:2754
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:2784
+#: src/transport/gnunet-communicator-udp.c:2897
 msgid "GNUnet UDP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:782
+#: src/transport/gnunet-communicator-unix.c:788
 #, fuzzy
 msgid ""
 "Maximum number of UNIX connections exceeded, dropping incoming message\n"
 msgstr "Maximale Anzahl der Verbindungen ist %u\n"
 
-#: src/transport/gnunet-communicator-unix.c:1009
+#: src/transport/gnunet-communicator-unix.c:1015
 #, fuzzy
 msgid "UNIX communicator is lacking key configuration settings. Exiting.\n"
 msgstr "GNUnet Konfiguration"
 
-#: src/transport/gnunet-communicator-unix.c:1054
+#: src/transport/gnunet-communicator-unix.c:1060
 #: src/transport/plugin_transport_unix.c:1383
 #, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "Pfad zu »%s« kann nicht erstellt werden\n"
 
-#: src/transport/gnunet-communicator-unix.c:1132
+#: src/transport/gnunet-communicator-unix.c:1138
 msgid "GNUnet UNIX domain socket communicator"
 msgstr ""
 
@@ -6971,38 +7013,38 @@ msgstr ""
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:791
+#: src/transport/gnunet-service-transport.c:794
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1474
+#: src/transport/gnunet-service-transport.c:1477
 msgid "# bytes payload discarded due to not connected peer"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1619
+#: src/transport/gnunet-service-transport.c:1622
 msgid "# bytes total received"
 msgstr "# Bytes insgesamt empfangen"
 
-#: src/transport/gnunet-service-transport.c:1709
+#: src/transport/gnunet-service-transport.c:1712
 msgid "# bytes payload received"
 msgstr "# Bytes Nutzdaten empfangen"
 
-#: src/transport/gnunet-service-transport.c:2013
-#: src/transport/gnunet-service-transport.c:2452
+#: src/transport/gnunet-service-transport.c:2016
+#: src/transport/gnunet-service-transport.c:2450
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2456
+#: src/transport/gnunet-service-transport.c:2454
 #, fuzzy, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
 
-#: src/transport/gnunet-service-transport.c:2551
+#: src/transport/gnunet-service-transport.c:2549
 #, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2560
+#: src/transport/gnunet-service-transport.c:2558
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
@@ -7246,7 +7288,7 @@ msgstr ""
 #: src/transport/gnunet-service-transport_validation.c:489
 #: src/transport/gnunet-service-transport_validation.c:679
 #: src/transport/gnunet-service-transport_validation.c:1000
-#: src/transport/gnunet-service-transport_validation.c:1626
+#: src/transport/gnunet-service-transport_validation.c:1627
 #, fuzzy
 msgid "# validations running"
 msgstr "Sqlite-Datenbank läuft\n"
@@ -7303,32 +7345,32 @@ msgid ""
 "having this address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1278
+#: src/transport/gnunet-service-transport_validation.c:1279
 #, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "PONG-Signatur für Knoten »%s« konnte nicht erstellt werden\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1330
+#: src/transport/gnunet-service-transport_validation.c:1331
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1339
+#: src/transport/gnunet-service-transport_validation.c:1340
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1514
+#: src/transport/gnunet-service-transport_validation.c:1515
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1532
+#: src/transport/gnunet-service-transport_validation.c:1533
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1589
+#: src/transport/gnunet-service-transport_validation.c:1590
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1644
+#: src/transport/gnunet-service-transport_validation.c:1645
 msgid "# HELLOs given to peerinfo"
 msgstr ""
 
@@ -7929,17 +7971,17 @@ msgstr "Zugriff verweigert auf »%s«\n"
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1397
+#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1396
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "`%s' fehlgeschlagen für Laufwerk %s: %u\n"
 
-#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1409
+#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1408
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "`%s' schlug fehl für Port %d: %s. Läuft gnunetd bereits?\n"
 
-#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1416
+#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1415
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "%s schlug fehl, Nachrichten Typ %d ist bereits in Verwendung.\n"
@@ -7951,7 +7993,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:345 src/util/service.c:834
+#: src/transport/tcp_service_legacy.c:345 src/util/service.c:833
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
@@ -7961,23 +8003,23 @@ msgstr ""
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:410 src/util/service.c:947
+#: src/transport/tcp_service_legacy.c:410 src/util/service.c:946
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:451 src/util/service.c:988
+#: src/transport/tcp_service_legacy.c:451 src/util/service.c:987
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:890
-#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1477
+#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1476
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1501
+#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1500
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -7992,29 +8034,29 @@ msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 msgid "Service `%s' runs at %s\n"
 msgstr "Dienst »%s« läuft auf %s\n"
 
-#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1747
+#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1746
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1752
+#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1751
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1757
+#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1756
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1253 src/util/disk.c:1177
-#: src/util/service.c:1638
+#: src/transport/tcp_service_legacy.c:1253 src/util/disk.c:1176
+#: src/util/service.c:1637
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Fehler beim Speichern der Konfigurationsdatei: `%s': %s.\n"
 
-#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1640
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1639
 msgid "No such user"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1654
+#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1653
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Benutzer/Gruppe kann nicht zu »%s« geändert werden: %s\n"
@@ -8024,13 +8066,13 @@ msgid "do daemonize (detach from terminal)"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:1397
-#: src/transport/transport-testing2.c:906 src/util/service.c:2070
-#: src/util/service.c:2082
+#: src/transport/transport-testing2.c:1061 src/util/service.c:2072
+#: src/util/service.c:2084
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Konfigurationsdatei `%s' wurde erzeugt.\n"
 
-#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2092
+#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2094
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "GNUnet Konfiguration"
@@ -8040,39 +8082,89 @@ msgstr "GNUnet Konfiguration"
 msgid "Could not access configuration file `%s'\n"
 msgstr "Konfigurationsdatei `%s' konnte nicht geparst werden.\n"
 
-#: src/transport/transport_api2_communication.c:704
+#: src/transport/transport_api2_communication.c:743
 msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/util/bio.c:177 src/util/bio.c:185
+#: src/util/bio.c:227 src/util/bio.c:235
 #, fuzzy, c-format
-msgid "Error reading `%s': %s"
+msgid "Error reading `%s' from file: %s"
 msgstr "Fehler beim Anlegen des Benutzers"
 
-#: src/util/bio.c:187
+#: src/util/bio.c:237
 msgid "End of file"
 msgstr "Dateiende"
 
-#: src/util/bio.c:244
+#: src/util/bio.c:266
+#, fuzzy, c-format
+msgid "Error while reading `%s' from buffer: %s"
+msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
+
+#: src/util/bio.c:268
+msgid "Not enough data left"
+msgstr ""
+
+#: src/util/bio.c:308
+#, fuzzy, c-format
+msgid "Invalid handle type while reading `%s'"
+msgstr "Ungültiges Befehlszeilenargument »%s«\n"
+
+#: src/util/bio.c:335 src/util/bio.c:838
+msgid "string length"
+msgstr ""
+
+#: src/util/bio.c:341
+#, fuzzy, c-format
+msgid "%s (while reading `%s')"
+msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
+
+#: src/util/bio.c:346
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:255
+#: src/util/bio.c:359
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:303
-#, c-format
-msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
+#: src/util/bio.c:398 src/util/bio.c:863 src/util/bio.c:880
+msgid "metadata length"
 msgstr ""
 
-#: src/util/bio.c:319
+#: src/util/bio.c:410
 #, c-format
-msgid "Metadata `%s' failed to deserialize"
+msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
+msgstr ""
+
+#: src/util/bio.c:426
+#, fuzzy, c-format
+msgid "Failed to deserialize metadata `%s'"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
+#: src/util/bio.c:667
+msgid "Unable to flush buffer to file"
 msgstr ""
 
+#: src/util/bio.c:729 src/util/bio.c:750
+#, fuzzy, c-format
+msgid "Error while writing `%s' to file: %s"
+msgstr "Konfigurationsdatei `%s' konnte nicht geöffnet werden.\n"
+
+#: src/util/bio.c:731
+msgid "No associated file"
+msgstr ""
+
+#: src/util/bio.c:815
+#, fuzzy, c-format
+msgid "Invalid handle type while writing `%s'"
+msgstr "Ungültiger Parameter: `%s'\n"
+
+#: src/util/bio.c:875
+#, fuzzy, c-format
+msgid "Failed to serialize metadata `%s'"
+msgstr "Fehler beim Lesen der Freunde-Liste von `%s'\n"
+
 #: src/util/client.c:747 src/util/client.c:937
 msgid "not a valid filename"
 msgstr ""
@@ -8082,27 +8174,27 @@ msgstr ""
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:259 src/util/common_logging.c:1112
+#: src/util/common_logging.c:259 src/util/common_logging.c:1114
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/common_logging.c:261 src/util/common_logging.c:1110
+#: src/util/common_logging.c:261 src/util/common_logging.c:1112
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:263 src/util/common_logging.c:1108
+#: src/util/common_logging.c:263 src/util/common_logging.c:1110
 msgid "MESSAGE"
 msgstr ""
 
-#: src/util/common_logging.c:265 src/util/common_logging.c:1106
+#: src/util/common_logging.c:265 src/util/common_logging.c:1108
 msgid "WARNING"
 msgstr "WARNUNG"
 
-#: src/util/common_logging.c:267 src/util/common_logging.c:1104
+#: src/util/common_logging.c:267 src/util/common_logging.c:1106
 msgid "ERROR"
 msgstr "FEHLER"
 
-#: src/util/common_logging.c:269 src/util/common_logging.c:1114
+#: src/util/common_logging.c:269 src/util/common_logging.c:1116
 msgid "NONE"
 msgstr ""
 
@@ -8111,31 +8203,31 @@ msgstr ""
 msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:902
+#: src/util/common_logging.c:904
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1115
+#: src/util/common_logging.c:1117
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1396
+#: src/util/common_logging.c:1398
 msgid "unknown address"
 msgstr "Unbekannte Adresse"
 
-#: src/util/common_logging.c:1441
+#: src/util/common_logging.c:1443
 msgid "invalid address"
 msgstr "Ungültige Adresse"
 
-#: src/util/common_logging.c:1460
+#: src/util/common_logging.c:1462
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 "Die Konfigurationsdatei muss in der Sektion `%s' unter `%s' ein Verzeichnis "
 "angeben, in dem FS Daten gespeichert werden.\n"
 
-#: src/util/common_logging.c:1483
+#: src/util/common_logging.c:1485
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8188,42 +8280,17 @@ msgid ""
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:705
+#: src/util/crypto_ecc.c:663
 #, fuzzy, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/util/crypto_ecc.c:822
+#: src/util/crypto_ecc.c:791
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 
-#: src/util/crypto_ecc_setup.c:136 src/util/crypto_ecc_setup.c:178
-#: src/util/crypto_ecc_setup.c:318 src/util/crypto_ecc_setup.c:360
-#, fuzzy, c-format
-msgid "Could not acquire lock on file `%s': %s...\n"
-msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n"
-
-#: src/util/crypto_ecc_setup.c:142 src/util/crypto_ecc_setup.c:324
-#, fuzzy
-msgid "Creating a new private key.  This may take a while.\n"
-msgstr "Ein neuer Hostkey wird erzeugt (dies kann eine Weile dauern).\n"
-
-#: src/util/crypto_ecc_setup.c:184 src/util/crypto_ecc_setup.c:366
-msgid "This may be ok if someone is currently generating a private key.\n"
-msgstr ""
-
-#: src/util/crypto_ecc_setup.c:220 src/util/crypto_ecc_setup.c:402
-#, c-format
-msgid ""
-"When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
-msgstr ""
-
-#: src/util/crypto_ecc_setup.c:225 src/util/crypto_ecc_setup.c:407
-msgid "This may be ok if someone is currently generating a key.\n"
-msgstr ""
-
-#: src/util/crypto_ecc_setup.c:469
+#: src/util/crypto_ecc_setup.c:369
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "Anwendung `%s' konnte nicht initialisiert werden.\n"
@@ -8234,17 +8301,17 @@ msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 "libgcrypt hat nicht die erwartete Version (Version %s wird vorausgesetzt).\n"
 
-#: src/util/crypto_rsa.c:956
+#: src/util/crypto_rsa.c:959
 #, fuzzy, c-format
 msgid "RSA signing failed at %s:%d: %s\n"
 msgstr "`%s' schlug fehl bei %s:%d mit dem Fehler: `%s'.\n"
 
-#: src/util/crypto_rsa.c:1314
+#: src/util/crypto_rsa.c:1318
 #, fuzzy, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "RSA Signaturüberprüfung fehlgeschlagen bei %s:%d: %s\n"
 
-#: src/util/disk.c:941
+#: src/util/disk.c:940
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "`%s' erwartet, dass `%s' ein Verzeichnis ist!\n"
@@ -8378,41 +8445,52 @@ msgid "use configuration file FILENAME"
 msgstr ""
 "Einen Wert aus der Konfigurationsdatei auf der Standardausgabe ausgeben"
 
-#: src/util/getopt_helpers.c:568 src/util/getopt_helpers.c:634
-#: src/util/getopt_helpers.c:835 src/util/getopt_helpers.c:900
+#: src/util/getopt_helpers.c:568 src/util/getopt_helpers.c:859
+#: src/util/getopt_helpers.c:924
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Sie müssen für die Option »%s« zusätzlich eine Zahl angeben.\n"
 
-#: src/util/getopt_helpers.c:659
+#: src/util/getopt_helpers.c:649
+#, fuzzy, c-format
+msgid ""
+"You must pass a relative time (optionally with sign) to the `%s' option.\n"
+msgstr "Sie müssen eine relative Zeit zu der Option »%s« übergeben.\n"
+
+#: src/util/getopt_helpers.c:656
+#, c-format
+msgid "Value given for time travel `%s' option is too big.\n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:683
 msgid "[+/-]MICROSECONDS"
 msgstr ""
 
-#: src/util/getopt_helpers.c:661
+#: src/util/getopt_helpers.c:685
 msgid "modify system time by given offset (for debugging/testing only)"
 msgstr ""
 
-#: src/util/getopt_helpers.c:696
+#: src/util/getopt_helpers.c:720
 #, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "Sie müssen eine relative Zeit zu der Option »%s« übergeben.\n"
 
-#: src/util/getopt_helpers.c:761
+#: src/util/getopt_helpers.c:785
 #, fuzzy, c-format
 msgid "You must pass absolute time to the `%s' option.\n"
 msgstr "Sie müssen eine relative Zeit zu der Option »%s« übergeben.\n"
 
-#: src/util/getopt_helpers.c:828
+#: src/util/getopt_helpers.c:852
 #, c-format
 msgid "Your input for the '%s' option has to be a non negative number\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:907
+#: src/util/getopt_helpers.c:931
 #, fuzzy, c-format
 msgid "You must pass a number below %u to the `%s' option.\n"
 msgstr "Sie müssen für die Option »%s« zusätzlich eine Zahl angeben.\n"
 
-#: src/util/getopt_helpers.c:994
+#: src/util/getopt_helpers.c:1018
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
@@ -8485,7 +8563,7 @@ msgstr ""
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:175
+#: src/util/gnunet-ecc.c:177
 #, c-format
 msgid ""
 "\n"
@@ -8510,54 +8588,54 @@ msgid ""
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:277
+#: src/util/gnunet-ecc.c:303
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr "Kommando `%s' wurde nicht gefunden!\n"
 
-#: src/util/gnunet-ecc.c:287
+#: src/util/gnunet-ecc.c:313
 #, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:307
+#: src/util/gnunet-ecc.c:333
 #, fuzzy, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n"
 
-#: src/util/gnunet-ecc.c:361
+#: src/util/gnunet-ecc.c:387
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:425
+#: src/util/gnunet-ecc.c:451
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:431
+#: src/util/gnunet-ecc.c:457
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:437
+#: src/util/gnunet-ecc.c:463
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:442
+#: src/util/gnunet-ecc.c:468
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:447
+#: src/util/gnunet-ecc.c:473
 msgid "print the private key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:452
+#: src/util/gnunet-ecc.c:478
 msgid "print the public key in HEX format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:458
+#: src/util/gnunet-ecc.c:484
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:472
+#: src/util/gnunet-ecc.c:498
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
@@ -8592,32 +8670,32 @@ msgstr ""
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:179
+#: src/util/gnunet-resolver.c:182
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:219
+#: src/util/gnunet-scrypt.c:222
 #, fuzzy, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Das Parsen des Hello von `%s' schlug fehl.\n"
 
-#: src/util/gnunet-scrypt.c:285
+#: src/util/gnunet-scrypt.c:288
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:291
+#: src/util/gnunet-scrypt.c:294
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:297
+#: src/util/gnunet-scrypt.c:300
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:303
+#: src/util/gnunet-scrypt.c:306
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:316
+#: src/util/gnunet-scrypt.c:319
 msgid "Manipulate GNUnet proof of work files"
 msgstr ""
 
@@ -8660,19 +8738,19 @@ msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:408
+#: src/util/os_installation.c:409
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:791
+#: src/util/os_installation.c:792
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Knoten `%s' konnte nicht in der Routing Tabelle gefunden werden!\n"
 
-#: src/util/os_installation.c:824
+#: src/util/os_installation.c:825
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
@@ -8754,14 +8832,14 @@ msgstr "Standarddienst »%s« ist nicht korrekt eingerichtet!\n"
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "`%s' konnte nicht aufgelöst werden: %s\n"
 
-#: src/util/service.c:654
+#: src/util/service.c:653
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
-#: src/util/service.c:1569
+#: src/util/service.c:1568
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
@@ -8776,116 +8854,116 @@ msgstr ""
 msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
 
-#: src/util/strings.c:177
+#: src/util/strings.c:178
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:498
+#: src/util/strings.c:502
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:622
+#: src/util/strings.c:636
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:691
+#: src/util/strings.c:705
 msgid "µs"
 msgstr "µs"
 
-#: src/util/strings.c:695
+#: src/util/strings.c:709
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:697
+#: src/util/strings.c:711
 msgid "0 ms"
 msgstr "0 ms"
 
-#: src/util/strings.c:701
+#: src/util/strings.c:715
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:705
+#: src/util/strings.c:719
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:709
+#: src/util/strings.c:723
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:713
+#: src/util/strings.c:727
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:719
+#: src/util/strings.c:733
 msgid "day"
 msgstr "Tag"
 
-#: src/util/strings.c:721
+#: src/util/strings.c:735
 msgid "days"
 msgstr "Tage"
 
-#: src/util/strings.c:749
+#: src/util/strings.c:763
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1219
+#: src/util/strings.c:1239
 msgid "IPv6 address did not start with `['\n"
 msgstr "IPv6-Adresse beginnt nicht mit »[«\n"
 
-#: src/util/strings.c:1227
+#: src/util/strings.c:1247
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr "IPv6-Adresse enthält kein »:« zur Abtrennung der Portnummer\n"
 
-#: src/util/strings.c:1234
+#: src/util/strings.c:1254
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr "IPv6-Adresse enthält kein »]« vor »:« zur Abtrennung der Portnummer\n"
 
-#: src/util/strings.c:1242
+#: src/util/strings.c:1262
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr "IPv6-Adresse enthält keine gültige Portnummer nach dem letzten »:«\n"
 
-#: src/util/strings.c:1251
+#: src/util/strings.c:1271
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ungültige Antwort auf `%s' von `%s'\n"
 
-#: src/util/strings.c:1479 src/util/strings.c:1490
+#: src/util/strings.c:1498 src/util/strings.c:1509
 msgid "Port not in range\n"
 msgstr "Port außerhalb des Bereichs\n"
 
-#: src/util/strings.c:1499
+#: src/util/strings.c:1518
 #, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1582 src/util/strings.c:1611 src/util/strings.c:1658
-#: src/util/strings.c:1678
+#: src/util/strings.c:1601 src/util/strings.c:1630 src/util/strings.c:1677
+#: src/util/strings.c:1697
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ungültiges Format für IP: »%s«\n"
 
-#: src/util/strings.c:1636
+#: src/util/strings.c:1655
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ungültige Netzwerk-Notation ('/%d ist nicht gültig in IPv4 CIDR)."
 
-#: src/util/strings.c:1687
+#: src/util/strings.c:1706
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Ungültiges Format für IP: `%s'\n"
 
-#: src/util/strings.c:1740
+#: src/util/strings.c:1759
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ungültige Netzwerk-Notation (endet nicht mit »;«: »%s«)\n"
 
-#: src/util/strings.c:1790
+#: src/util/strings.c:1809
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Falsches Format `%s' für Netzmaske: %s\n"
 
-#: src/util/strings.c:1821
+#: src/util/strings.c:1840
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Falsches Format `%s' für Netzwerk: %s\n"
@@ -9081,6 +9159,14 @@ msgstr "Tunnel über VPN einrichten."
 msgid "Failed to connect to the namestore!\n"
 msgstr "Es konnte keine Verbindung mit gnunetd hergestellt werden.\n"
 
+#, fuzzy, c-format
+#~ msgid "Could not acquire lock on file `%s': %s...\n"
+#~ msgstr "PID konnte nicht in Datei `%s' geschrieben werden: %s.\n"
+
+#, fuzzy
+#~ msgid "Creating a new private key.  This may take a while.\n"
+#~ msgstr "Ein neuer Hostkey wird erzeugt (dies kann eine Weile dauern).\n"
+
 #, fuzzy
 #~ msgid "GNS REST API initialized\n"
 #~ msgstr " Verbindung fehlgeschlagen\n"
diff --git a/po/es.po b/po/es.po
index be0d5926e..49c190edd 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.9.5a\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2020-01-13 14:01+0000\n"
+"POT-Creation-Date: 2020-07-07 12:22+0200\n"
 "PO-Revision-Date: 2013-02-23 17:50+0100\n"
 "Last-Translator: Miguel �ngel Arruga Vivas <rosen644835@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -18,131 +18,131 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/abd/gnunet-abd.c:397 src/namestore/gnunet-namestore.c:1271
+#: src/abd/gnunet-abd.c:397 src/namestore/gnunet-namestore.c:1302
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "'%s': servicio desconocido: %s\n"
 
-#: src/abd/gnunet-abd.c:413 src/abd/gnunet-abd.c:886
+#: src/abd/gnunet-abd.c:413 src/abd/gnunet-abd.c:896
 #, fuzzy, c-format
 msgid "Issuer public key `%s' is not well-formed\n"
 msgstr "El bloque del tipo %u está mal formado\n"
 
-#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1747
-#: src/namestore/gnunet-namestore-fcfsd.c:1153
+#: src/abd/gnunet-abd.c:560 src/abd/gnunet-service-abd.c:1747
 #: src/namestore/gnunet-namestore.c:1001
+#: src/namestore/gnunet-namestore-fcfsd.c:1154
 #, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "Se produjo un fallo al conectar con el almacén de nombres\n"
 
-#: src/abd/gnunet-abd.c:825 src/abd/gnunet-abd.c:876
+#: src/abd/gnunet-abd.c:835 src/abd/gnunet-abd.c:886
 #, fuzzy, c-format
 msgid "Issuer public key not well-formed\n"
 msgstr "El bloque del tipo %u está mal formado\n"
 
-#: src/abd/gnunet-abd.c:834 src/abd/gnunet-abd.c:895
+#: src/abd/gnunet-abd.c:844 src/abd/gnunet-abd.c:905
 #, fuzzy, c-format
 msgid "Failed to connect to ABD\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
 
-#: src/abd/gnunet-abd.c:840
+#: src/abd/gnunet-abd.c:850
 #, c-format
 msgid "You must provide issuer the attribute\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:847
+#: src/abd/gnunet-abd.c:857
 #, fuzzy, c-format
 msgid "ego required\n"
 msgstr "Tipo requerido\n"
 
-#: src/abd/gnunet-abd.c:857
+#: src/abd/gnunet-abd.c:867
 #, c-format
 msgid "Subject public key needed\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:866
+#: src/abd/gnunet-abd.c:876
 #, fuzzy, c-format
 msgid "Subject public key `%s' is not well-formed\n"
 msgstr "El bloque del tipo %u está mal formado\n"
 
-#: src/abd/gnunet-abd.c:901
+#: src/abd/gnunet-abd.c:911
 #, c-format
 msgid "You must provide issuer and subject attributes\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:957
+#: src/abd/gnunet-abd.c:970
 #, c-format
 msgid "Please specify name to lookup, subject key and issuer key!\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:978
+#: src/abd/gnunet-abd.c:991
 msgid "verify credential against attribute"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:985
+#: src/abd/gnunet-abd.c:998
 #, fuzzy
 msgid ""
 "The public key of the subject to lookup thecredential for, or for issuer "
 "side storage: subject and its attributes"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/abd/gnunet-abd.c:992
+#: src/abd/gnunet-abd.c:1005
 msgid "The private, signed delegate presented by the subject"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:999
+#: src/abd/gnunet-abd.c:1012
 #, fuzzy
 msgid "The public key of the authority to verify the credential against"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/abd/gnunet-abd.c:1004
+#: src/abd/gnunet-abd.c:1017
 #, fuzzy
 msgid "The ego/zone name to use"
 msgstr "tamaño del mensaje"
 
-#: src/abd/gnunet-abd.c:1010
+#: src/abd/gnunet-abd.c:1023
 msgid "The issuer attribute to verify against or to issue"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1016
+#: src/abd/gnunet-abd.c:1029
 msgid ""
 "The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1021
+#: src/abd/gnunet-abd.c:1034
 msgid "collect credentials"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1026
+#: src/abd/gnunet-abd.c:1039
 msgid "Create and issue a credential issuer side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1031
+#: src/abd/gnunet-abd.c:1044
 msgid "Issue a credential subject side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1036
+#: src/abd/gnunet-abd.c:1049
 msgid "Create, sign and return a credential subject side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1043
+#: src/abd/gnunet-abd.c:1056
 msgid "Import signed credentials that should be issued to a zone/ego"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1047
+#: src/abd/gnunet-abd.c:1060
 msgid "Create private record entry."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1053 src/abd/gnunet-abd.c:1059
+#: src/abd/gnunet-abd.c:1066 src/abd/gnunet-abd.c:1072
 msgid "Indicates that the collect/verify process is done via forward search."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1072
+#: src/abd/gnunet-abd.c:1085
 #, fuzzy
 msgid "GNUnet abd resolver tool"
 msgstr "Herramienta de acceso GNUnet GNS"
 
-#: src/abd/gnunet-service-abd.c:1742 src/gns/gnunet-gns.c:288
+#: src/abd/gnunet-service-abd.c:1742 src/gns/gnunet-gns.c:292
 #, c-format
 msgid "Failed to connect to GNS\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
@@ -395,8 +395,8 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:1129
 #: src/transport/plugin_transport_tcp.c:3706
 #: src/transport/tcp_service_legacy.c:594
-#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1094
-#: src/util/service.c:1100
+#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1090
+#: src/util/service.c:1096
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
@@ -404,22 +404,22 @@ msgstr ""
 "configuración!\n"
 
 #: src/arm/gnunet-service-arm.c:452 src/transport/plugin_transport_tcp.c:1163
-#: src/transport/tcp_service_legacy.c:634 src/util/client.c:519
-#: src/util/service.c:1133
+#: src/transport/tcp_service_legacy.c:634 src/util/client.c:527
+#: src/util/service.c:1129
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 "La ruta tipo UNIX «%s» es demasiado larga, la longitud máxima es %llu\n"
 
 #: src/arm/gnunet-service-arm.c:456 src/transport/plugin_transport_tcp.c:1167
-#: src/transport/tcp_service_legacy.c:638 src/util/client.c:524
-#: src/util/service.c:1137
+#: src/transport/tcp_service_legacy.c:638 src/util/client.c:532
+#: src/util/service.c:1133
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr "Usando «%s» en su defecto\n"
 
 #: src/arm/gnunet-service-arm.c:484 src/transport/plugin_transport_tcp.c:1195
-#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1157
+#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1153
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -429,7 +429,7 @@ msgstr ""
 "«%s», no se pudo crear un «socket» UNIX: %s\n"
 
 #: src/arm/gnunet-service-arm.c:505 src/transport/plugin_transport_tcp.c:1213
-#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1175
+#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1171
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
@@ -439,7 +439,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:536
 #: src/transport/plugin_transport_http_server.c:2718
 #: src/transport/plugin_transport_tcp.c:1244
-#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1206
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1202
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Se produjo un fallo al resolver «%s»: %s\n"
@@ -447,7 +447,7 @@ msgstr "Se produjo un fallo al resolver «%s»: %s\n"
 #: src/arm/gnunet-service-arm.c:555
 #: src/transport/plugin_transport_http_server.c:2736
 #: src/transport/plugin_transport_tcp.c:1263
-#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1225
+#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1221
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "No se encontró la dirección %s para «%s».\n"
@@ -525,15 +525,95 @@ msgstr "El servicio «%s» finalizó con estado %s/%d, se reiniciará en %llu ms
 msgid "Initiating shutdown as requested by client.\n"
 msgstr "Iniciando apagado bajo petición del cliente.\n"
 
-#: src/ats-tests/ats-testing-log.c:896
-msgid "Stop logging\n"
+#: src/ats/gnunet-ats-solver-eval.c:2992 src/ats/gnunet-ats-solver-eval.c:3044
+#, c-format
+msgid ""
+"Could not load quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
 msgstr ""
+"No se pudieron cargar las cuotas para la red «%s»:  «%s», asignando el ancho "
+"de banda predeterminado %llu\n"
 
-#: src/ats-tests/ats-testing-log.c:952
-#, fuzzy, c-format
-msgid "Start logging `%s'\n"
+#: src/ats/gnunet-ats-solver-eval.c:3011
+#, c-format
+msgid ""
+"No outbound quota configured for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+"No hay configurada una cuota de salida para la red «%s», asignando el ancho "
+"de banda predeterminado %llu\n"
+
+#: src/ats/gnunet-ats-solver-eval.c:3063
+#, c-format
+msgid ""
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+"No hay configurada una cuota de salida para la red «%s», asignando el ancho "
+"de banda predeterminado %llu\n"
+
+#: src/ats/gnunet-ats-solver-eval.c:3552 src/ats-tests/gnunet-solver-eval.c:997
+#, fuzzy
+msgid "solver to use"
+msgstr "valor a establecer"
+
+#: src/ats/gnunet-ats-solver-eval.c:3557
+#: src/ats-tests/gnunet-solver-eval.c:1003
+#: src/ats-tests/gnunet-solver-eval.c:1008
+msgid "experiment to use"
+msgstr "experimento para usar"
+
+#: src/ats/gnunet-ats-solver-eval.c:3564
+#, fuzzy
+msgid "print logging"
 msgstr "Iniciando descarga «%s».\n"
 
+#: src/ats/gnunet-ats-solver-eval.c:3569
+msgid "save logging to disk"
+msgstr "guarda protocolo al fichero en disco"
+
+#: src/ats/gnunet-ats-solver-eval.c:3574
+msgid "disable normalization"
+msgstr "deshabilita normalización"
+
+#: src/ats/gnunet-service-ats_plugins.c:326
+#, fuzzy, c-format
+msgid ""
+"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+"No se pudieron cargar las cuotas para la red «%s»:  «%s», asignando el ancho "
+"de banda predeterminado %llu\n"
+
+# Miguel: "Inbound" lo he traducido como entrada en todo el texto.
+#: src/ats/gnunet-service-ats_plugins.c:336
+#, fuzzy, c-format
+msgid "%s quota configured for network `%s' is %llu\n"
+msgstr "La cuota de entrada configurada para la red «%s» es %llu\n"
+
+#: src/ats/gnunet-service-ats_plugins.c:382
+#, fuzzy, c-format
+msgid ""
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
+msgstr ""
+"No hay configurada una cuota de salida para la red «%s», asignando el ancho "
+"de banda predeterminado %llu\n"
+
+#: src/ats/gnunet-service-ats_plugins.c:474
+#, fuzzy, c-format
+msgid "Failed to initialize solver `%s'!\n"
+msgstr "¡No se puede inicializar el resolvedor!\n"
+
+#: src/ats/plugin_ats_proportional.c:1142
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr "Se produjo un fallo al cargar la configuración de %s\n"
+
+#: src/ats/plugin_ats_proportional.c:1165
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f\n"
+msgstr "Se produjo un fallo al cargar la configuración de %s\n"
+
 #: src/ats-tests/ats-testing.c:420
 #, c-format
 msgid "Connected master [%u] with slave [%u]\n"
@@ -544,6 +624,15 @@ msgstr ""
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr "Fallo al conectar a gnunetd.\n"
 
+#: src/ats-tests/ats-testing-log.c:896
+msgid "Stop logging\n"
+msgstr ""
+
+#: src/ats-tests/ats-testing-log.c:952
+#, fuzzy, c-format
+msgid "Start logging `%s'\n"
+msgstr "Iniciando descarga «%s».\n"
+
 #: src/ats-tests/gnunet-ats-sim.c:92
 #, c-format
 msgid ""
@@ -551,17 +640,6 @@ msgid ""
 "= %u KiB/s\n"
 msgstr ""
 
-#: src/ats-tests/gnunet-solver-eval.c:997 src/ats/gnunet-ats-solver-eval.c:3552
-#, fuzzy
-msgid "solver to use"
-msgstr "valor a establecer"
-
-#: src/ats-tests/gnunet-solver-eval.c:1003
-#: src/ats-tests/gnunet-solver-eval.c:1008
-#: src/ats/gnunet-ats-solver-eval.c:3557
-msgid "experiment to use"
-msgstr "experimento para usar"
-
 # Miguel: ¿Como podría traducir "resolutions" y "resolve"?
 # Son difíciles de no calcar, puesto que no conozco como expresar
 # el concepto de obtener una dirección a partir de un nombre
@@ -696,84 +774,6 @@ msgstr "salida prolija (incluye las propiedades de direcciones del ATS)"
 msgid "Print information about ATS state"
 msgstr "Imprime información acerca del estado del ATS"
 
-#: src/ats/gnunet-ats-solver-eval.c:2992 src/ats/gnunet-ats-solver-eval.c:3044
-#, c-format
-msgid ""
-"Could not load quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-"No se pudieron cargar las cuotas para la red «%s»:  «%s», asignando el ancho "
-"de banda predeterminado %llu\n"
-
-#: src/ats/gnunet-ats-solver-eval.c:3011
-#, c-format
-msgid ""
-"No outbound quota configured for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-"No hay configurada una cuota de salida para la red «%s», asignando el ancho "
-"de banda predeterminado %llu\n"
-
-#: src/ats/gnunet-ats-solver-eval.c:3063
-#, c-format
-msgid ""
-"No outbound quota configure for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-"No hay configurada una cuota de salida para la red «%s», asignando el ancho "
-"de banda predeterminado %llu\n"
-
-#: src/ats/gnunet-ats-solver-eval.c:3564
-#, fuzzy
-msgid "print logging"
-msgstr "Iniciando descarga «%s».\n"
-
-#: src/ats/gnunet-ats-solver-eval.c:3569
-msgid "save logging to disk"
-msgstr "guarda protocolo al fichero en disco"
-
-#: src/ats/gnunet-ats-solver-eval.c:3574
-msgid "disable normalization"
-msgstr "deshabilita normalización"
-
-#: src/ats/gnunet-service-ats_plugins.c:326
-#, fuzzy, c-format
-msgid ""
-"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-"No se pudieron cargar las cuotas para la red «%s»:  «%s», asignando el ancho "
-"de banda predeterminado %llu\n"
-
-# Miguel: "Inbound" lo he traducido como entrada en todo el texto.
-#: src/ats/gnunet-service-ats_plugins.c:336
-#, fuzzy, c-format
-msgid "%s quota configured for network `%s' is %llu\n"
-msgstr "La cuota de entrada configurada para la red «%s» es %llu\n"
-
-#: src/ats/gnunet-service-ats_plugins.c:382
-#, fuzzy, c-format
-msgid ""
-"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
-msgstr ""
-"No hay configurada una cuota de salida para la red «%s», asignando el ancho "
-"de banda predeterminado %llu\n"
-
-#: src/ats/gnunet-service-ats_plugins.c:474
-#, fuzzy, c-format
-msgid "Failed to initialize solver `%s'!\n"
-msgstr "¡No se puede inicializar el resolvedor!\n"
-
-#: src/ats/plugin_ats_proportional.c:1140
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f \n"
-msgstr "Se produjo un fallo al cargar la configuración de %s\n"
-
-#: src/ats/plugin_ats_proportional.c:1163
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f\n"
-msgstr "Se produjo un fallo al cargar la configuración de %s\n"
-
 #: src/auction/gnunet-auction-create.c:163
 msgid "description of the item to be sold"
 msgstr "descripción del elemento que está por vender"
@@ -812,7 +812,7 @@ msgstr ""
 
 #: src/auction/gnunet-auction-info.c:77 src/auction/gnunet-auction-join.c:77
 #: src/conversation/gnunet-conversation-test.c:256
-#: src/revocation/gnunet-revocation.c:524 src/template/gnunet-template.c:75
+#: src/revocation/gnunet-revocation.c:552 src/template/gnunet-template.c:75
 msgid "help text"
 msgstr "texto de ayuda"
 
@@ -912,28 +912,6 @@ msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 "El cliente se desconectó del servicio principal, tratando de reconectar.\n"
 
-#: src/conversation/gnunet-conversation-test.c:120
-#, c-format
-msgid ""
-"\n"
-"End of transmission.  Have a GNU day.\n"
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:146
-#, c-format
-msgid ""
-"\n"
-"We are now playing your recording back.  If you can hear it, your audio "
-"settings are working..."
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:218
-#, c-format
-msgid ""
-"We will now be recording you for %s. After that time, the recording will be "
-"played back to you..."
-msgstr ""
-
 #: src/conversation/gnunet-conversation.c:264
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
@@ -1194,8 +1172,30 @@ msgstr ""
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback-gst.c:363
+#: src/conversation/gnunet-conversation-test.c:120
+#, c-format
+msgid ""
+"\n"
+"End of transmission.  Have a GNU day.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:146
+#, c-format
+msgid ""
+"\n"
+"We are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:218
+#, c-format
+msgid ""
+"We will now be recording you for %s. After that time, the recording will be "
+"played back to you..."
+msgstr ""
+
 #: src/conversation/gnunet_gst.c:664
+#: src/conversation/gnunet-helper-audio-playback-gst.c:363
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
@@ -1439,13 +1439,13 @@ msgstr "# mensajes descartados (sesión desconectada)"
 msgid "# messages of type %u discarded (client busy)"
 msgstr "# bytes de mensajes del tipo %u recibidos"
 
-#: src/core/gnunet-service-core.c:926
+#: src/core/gnunet-service-core.c:927
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 "Al servicio principal le falta la configuración de la clave de máquina "
 "(HOSTKEY).  Saliendo.\n"
 
-#: src/core/gnunet-service-core.c:945
+#: src/core/gnunet-service-core.c:955
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "El servicio principal de «%4s» está listo.\n"
@@ -1476,121 +1476,121 @@ msgstr "# intercambio de claves parados"
 msgid "# PING messages transmitted"
 msgstr "# mensajes PONG creados"
 
-#: src/core/gnunet-service-core_kx.c:978
+#: src/core/gnunet-service-core_kx.c:979
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:992
+#: src/core/gnunet-service-core_kx.c:993
 #, fuzzy
 msgid "# duplicate ephemeral keys ignored"
 msgstr "# mapas de tipos recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1027
+#: src/core/gnunet-service-core_kx.c:1028
 #, fuzzy
 msgid "# EPHEMERAL_KEYs rejected (bad signature)"
 msgstr "# mensajes «SET_KEY» descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1045
+#: src/core/gnunet-service-core_kx.c:1046
 #, c-format
 msgid ""
 "EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match "
 "our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1052
+#: src/core/gnunet-service-core_kx.c:1053
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages rejected due to time"
 msgstr "# mensajes «SET_KEY» descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1070
+#: src/core/gnunet-service-core_kx.c:1071
 #, fuzzy
 msgid "# valid ephemeral keys received"
 msgstr "# mapas de tipos recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1179
+#: src/core/gnunet-service-core_kx.c:1180
 #: src/transport/gnunet-service-transport_validation.c:1133
 msgid "# PING messages received"
 msgstr "# mensajes PING recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1189
+#: src/core/gnunet-service-core_kx.c:1190
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
 
-#: src/core/gnunet-service-core_kx.c:1238
+#: src/core/gnunet-service-core_kx.c:1239
 msgid "# PONG messages created"
 msgstr "# mensajes PONG creados"
 
-#: src/core/gnunet-service-core_kx.c:1263
+#: src/core/gnunet-service-core_kx.c:1264
 msgid "# sessions terminated by timeout"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1276
+#: src/core/gnunet-service-core_kx.c:1277
 msgid "# keepalive messages sent"
 msgstr "# mensajes «keepalive» enviados"
 
-#: src/core/gnunet-service-core_kx.c:1333
-#: src/transport/gnunet-service-transport_validation.c:1475
+#: src/core/gnunet-service-core_kx.c:1334
+#: src/transport/gnunet-service-transport_validation.c:1476
 msgid "# PONG messages received"
 msgstr "# mensajes PONG recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1341
+#: src/core/gnunet-service-core_kx.c:1342
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# mensajes PONG recibidos"
 
-#: src/core/gnunet-service-core_kx.c:1349
+#: src/core/gnunet-service-core_kx.c:1350
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# Mensajes P2P omitidos debido a saturación de la cola"
 
-#: src/core/gnunet-service-core_kx.c:1388
+#: src/core/gnunet-service-core_kx.c:1389
 msgid "# PONG messages decrypted"
 msgstr "# mensajes PONG descifrados"
 
-#: src/core/gnunet-service-core_kx.c:1428
+#: src/core/gnunet-service-core_kx.c:1429
 msgid "# session keys confirmed via PONG"
 msgstr "# claves de sesión confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1440
+#: src/core/gnunet-service-core_kx.c:1441
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# bytes recibidos vía TCP"
 
-#: src/core/gnunet-service-core_kx.c:1449
+#: src/core/gnunet-service-core_kx.c:1450
 msgid "# rekey operations confirmed via PONG"
 msgstr "# operaciones de cambio de clave confirmadas vía PONG"
 
-#: src/core/gnunet-service-core_kx.c:1625
+#: src/core/gnunet-service-core_kx.c:1626
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1636
+#: src/core/gnunet-service-core_kx.c:1637
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1640
+#: src/core/gnunet-service-core_kx.c:1641
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# sesiones terminadas por plazo de expiración"
 
-#: src/core/gnunet-service-core_kx.c:1718
-#: src/core/gnunet-service-core_kx.c:1745
+#: src/core/gnunet-service-core_kx.c:1719
+#: src/core/gnunet-service-core_kx.c:1746
 msgid "# bytes dropped (duplicates)"
 msgstr "# bytes omitidos (duplicados)"
 
-#: src/core/gnunet-service-core_kx.c:1731
+#: src/core/gnunet-service-core_kx.c:1732
 msgid "# bytes dropped (out of sequence)"
 msgstr "# bytes omitidos (fuera de secuencia)"
 
-#: src/core/gnunet-service-core_kx.c:1776
+#: src/core/gnunet-service-core_kx.c:1777
 msgid "# bytes dropped (ancient message)"
 msgstr "# bytes omitidos (mensaje antiguo)"
 
-#: src/core/gnunet-service-core_kx.c:1785
+#: src/core/gnunet-service-core_kx.c:1786
 msgid "# bytes of payload decrypted"
 msgstr "# bytes de «payload» descifrados"
 
@@ -2015,16 +2015,16 @@ msgstr "«%s» para «%s» falló en %s: %d con error: %s\n"
 msgid "Mysql database running\n"
 msgstr "Base de datos Mysql ejecutándose\n"
 
-#: src/datastore/plugin_datastore_postgres.c:277
-#: src/datastore/plugin_datastore_postgres.c:890
+#: src/datastore/plugin_datastore_postgres.c:278
+#: src/datastore/plugin_datastore_postgres.c:891
 msgid "Postgress exec failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:851
+#: src/datastore/plugin_datastore_postgres.c:852
 msgid "Failed to drop table from database.\n"
 msgstr "Se produjo un fallo al borrar una tabla de la base de datos.\n"
 
-#: src/datastore/plugin_datastore_postgres.c:949
+#: src/datastore/plugin_datastore_postgres.c:950
 msgid "Postgres database running\n"
 msgstr "Base de datos Postgres ejecutándose\n"
 
@@ -2142,6 +2142,55 @@ msgstr "ser prolijo (imprime información de progreso)"
 msgid "Prints all packets that go through the DHT."
 msgstr "Imprime todos los paquetes que pasan por la DHT."
 
+#: src/dht/gnunet_dht_profiler.c:922 src/testbed/gnunet-testbed-profiler.c:255
+#, fuzzy, c-format
+msgid "Exiting as the number of peers is %u\n"
+msgstr "El número máximo de conexiones es %u\n"
+
+#: src/dht/gnunet_dht_profiler.c:955 src/rps/gnunet-rps-profiler.c:3194
+msgid "number of peers to start"
+msgstr "número de pares para empezar"
+
+#: src/dht/gnunet_dht_profiler.c:961
+msgid "number of PUTs to perform per peer"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:967 src/nse/gnunet-nse-profiler.c:872
+#: src/testbed/gnunet-testbed-profiler.c:305
+msgid "name of the file with the login information for the testbed"
+msgstr ""
+"nombre del fichero con la información de acceso usada para la batería de "
+"pruebas"
+
+#: src/dht/gnunet_dht_profiler.c:973
+msgid "delay between rounds for collecting statistics (default: 30 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:979
+msgid "delay to start doing PUTs (default: 1 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:985
+msgid "delay to start doing GETs (default: 5 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:990
+msgid "replication degree for DHT PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:996
+msgid "chance that a peer is selected at random for PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1002
+msgid "timeout for DHT PUT and GET requests (default: 1 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1023
+#, fuzzy
+msgid "Measure quality and performance of the DHT service."
+msgstr "Medir la calidad y rendimiento del servicio NSE."
+
 #: src/dht/gnunet-dht-put.c:133
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr "¡Se deben proveer «KEY» y «DATA» para una subida a la DHT!\n"
@@ -2406,55 +2455,6 @@ msgstr "# Entradas añadidas a la tabla de encaminamiento"
 msgid "# DHT requests combined"
 msgstr "# Peticiones a la DHT combinadas"
 
-#: src/dht/gnunet_dht_profiler.c:922 src/testbed/gnunet-testbed-profiler.c:255
-#, fuzzy, c-format
-msgid "Exiting as the number of peers is %u\n"
-msgstr "El número máximo de conexiones es %u\n"
-
-#: src/dht/gnunet_dht_profiler.c:955 src/rps/gnunet-rps-profiler.c:3194
-msgid "number of peers to start"
-msgstr "número de pares para empezar"
-
-#: src/dht/gnunet_dht_profiler.c:961
-msgid "number of PUTs to perform per peer"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:967 src/nse/gnunet-nse-profiler.c:872
-#: src/testbed/gnunet-testbed-profiler.c:305
-msgid "name of the file with the login information for the testbed"
-msgstr ""
-"nombre del fichero con la información de acceso usada para la batería de "
-"pruebas"
-
-#: src/dht/gnunet_dht_profiler.c:973
-msgid "delay between rounds for collecting statistics (default: 30 sec)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:979
-msgid "delay to start doing PUTs (default: 1 sec)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:985
-msgid "delay to start doing GETs (default: 5 min)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:990
-msgid "replication degree for DHT PUTs"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:996
-msgid "chance that a peer is selected at random for PUTs"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1002
-msgid "timeout for DHT PUT and GET requests (default: 1 min)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1023
-#, fuzzy
-msgid "Measure quality and performance of the DHT service."
-msgstr "Medir la calidad y rendimiento del servicio NSE."
-
 #: src/dht/plugin_block_dht.c:189
 #, c-format
 msgid "Block not of type %u\n"
@@ -2823,63 +2823,63 @@ msgstr "No se pudo leer el fichero «%s»: %s"
 msgid "Short read reading from file `%s'!"
 msgstr "¡Lectura corta leyendo del fichero «%s»!"
 
-#: src/fs/fs_api.c:1141
+#: src/fs/fs_api.c:1173
 #, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:1667
+#: src/fs/fs_api.c:1724
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr "Fallo mientras se reiniciaba la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:1682
+#: src/fs/fs_api.c:1739
 #, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la operación de publicación «%s»: %s\n"
 
-#: src/fs/fs_api.c:2366
+#: src/fs/fs_api.c:2468
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 "Se produjo un fallo mientras se retomaba la operación de publicación «%s»: "
 "%s\n"
 
-#: src/fs/fs_api.c:2377
+#: src/fs/fs_api.c:2479
 #, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la operación de desindexado «%s»: %s\n"
 
-#: src/fs/fs_api.c:2513 src/fs/fs_api.c:2759
+#: src/fs/fs_api.c:2627 src/fs/fs_api.c:2873
 #, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la sub-descarga «%s»: %s\n"
 
-#: src/fs/fs_api.c:2531
+#: src/fs/fs_api.c:2645
 #, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Se produjo un fallo al retomar la sub-búsqueda «%s»: %s\n"
 
-#: src/fs/fs_api.c:2547 src/fs/fs_api.c:2567 src/fs/fs_api.c:3058
+#: src/fs/fs_api.c:2661 src/fs/fs_api.c:2681 src/fs/fs_api.c:3180
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 "Se produjo un fallo mientras se retomaba la operación de búsqueda «%s»: %s\n"
 
-#: src/fs/fs_api.c:2749
+#: src/fs/fs_api.c:2863
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 "Se produjo un fallo al retomar la sub-descarga «%s»: no se pudo abrir el "
 "fichero «%s»\n"
 
-#: src/fs/fs_api.c:3002
+#: src/fs/fs_api.c:3124
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 "No se pudo retomar la búsqueda en ejecución, se retomará como una búsqueda "
 "en pausa\n"
 
-#: src/fs/fs_api.c:3097
+#: src/fs/fs_api.c:3219
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2994,17 +2994,17 @@ msgstr "No se encontró el tipo MIME «%s» en la lista de extensiones.\n"
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Se produjo un fallo al abrir «%s» para escritura: %s\n"
 
-#: src/fs/fs_namespace.c:227
+#: src/fs/fs_namespace.c:233
 #, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Se produjo un fallo al escribir «%s»: %s\n"
 
-#: src/fs/fs_namespace.c:321
+#: src/fs/fs_namespace.c:330
 #, fuzzy, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr "Se produjo un fallo al escribir «%s»: %s\n"
 
-#: src/fs/fs_namespace.c:463
+#: src/fs/fs_namespace.c:472
 msgid "Failed to connect to datastore."
 msgstr "Se produjo un fallo al conectar con el almacén de datos."
 
@@ -3241,41 +3241,41 @@ msgstr "Parámetro no válido «%s»\n"
 msgid "Unrecognized URI type"
 msgstr "Tipo de URI no reconocido"
 
-#: src/fs/fs_uri.c:1072 src/fs/fs_uri.c:1099
+#: src/fs/fs_uri.c:1071 src/fs/fs_uri.c:1098
 msgid "No keywords specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
 
-#: src/fs/fs_uri.c:1105
+#: src/fs/fs_uri.c:1104
 msgid "Number of double-quotes not balanced!\n"
 msgstr "¡Número de comillas dobles no balanceado!\n"
 
-#: src/fs/gnunet-auto-share.c:230
+#: src/fs/gnunet-auto-share.c:234
 #, c-format
 msgid "Failed to load state: %s\n"
 msgstr "Se produjo un fallo al cargar el estado: %s\n"
 
-#: src/fs/gnunet-auto-share.c:278 src/fs/gnunet-auto-share.c:287
-#: src/fs/gnunet-auto-share.c:295
+#: src/fs/gnunet-auto-share.c:286 src/fs/gnunet-auto-share.c:295
+#: src/fs/gnunet-auto-share.c:303
 #, c-format
 msgid "Failed to save state to file %s\n"
 msgstr "Se produjo un fallo al guardar el estado en el fichero %s\n"
 
-#: src/fs/gnunet-auto-share.c:392
+#: src/fs/gnunet-auto-share.c:400
 #, c-format
 msgid "Publication of `%s' done\n"
 msgstr "Publicación de «%s» finalizada\n"
 
-#: src/fs/gnunet-auto-share.c:471
+#: src/fs/gnunet-auto-share.c:479
 #, c-format
 msgid "Publishing `%s'\n"
 msgstr "Publicando «%s»\n"
 
-#: src/fs/gnunet-auto-share.c:483
+#: src/fs/gnunet-auto-share.c:491
 #, c-format
 msgid "Failed to run `%s'\n"
 msgstr "Se produjo un fallo al ejecutar «%s»\n"
 
-#: src/fs/gnunet-auto-share.c:653
+#: src/fs/gnunet-auto-share.c:661
 #, c-format
 msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
@@ -3283,28 +3283,28 @@ msgstr ""
 "Debes especificar uno y solo un nombre de directorio para publicación "
 "automática.\n"
 
-#: src/fs/gnunet-auto-share.c:703 src/fs/gnunet-publish.c:888
+#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:888
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "establece el nivel LEVEL deseado de anonimato del emisor"
 
-#: src/fs/gnunet-auto-share.c:710
+#: src/fs/gnunet-auto-share.c:718
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 "deshabilitar añadir tiempo de creación a los metadatos del fichero subido"
 
-#: src/fs/gnunet-auto-share.c:716 src/fs/gnunet-publish.c:893
+#: src/fs/gnunet-auto-share.c:724 src/fs/gnunet-publish.c:893
 msgid "do not use libextractor to add keywords or metadata"
 msgstr "no usar libextractor para añadir palabras clave o metadatos"
 
-#: src/fs/gnunet-auto-share.c:723 src/fs/gnunet-publish.c:938
+#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:938
 msgid "specify the priority of the content"
 msgstr "especificar la prioridad del contenido"
 
-#: src/fs/gnunet-auto-share.c:730 src/fs/gnunet-publish.c:951
+#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:951
 msgid "set the desired replication LEVEL"
 msgstr "establece el nivel LEVEL deseado de replicación"
 
-#: src/fs/gnunet-auto-share.c:753
+#: src/fs/gnunet-auto-share.c:761
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr "Publicar automáticamente ficheros de un directorio en GNUnet"
 
@@ -3438,6 +3438,14 @@ msgstr ""
 "Descargar ficheros de GNUnet usando una URI GNUnet CHK o LOC (gnunet://fs/"
 "chk/...)"
 
+#: src/fs/gnunet-fs.c:128
+msgid "print a list of all indexed files"
+msgstr "imprimir una lista de todos los ficheros indexados"
+
+#: src/fs/gnunet-fs.c:141
+msgid "Special file-sharing operations"
+msgstr "Operaciones especiales de compartición de ficheros"
+
 #: src/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr "ejecuta el experimento con «COUNT» pares"
@@ -3458,14 +3466,6 @@ msgstr ""
 "ejecuta una batería de pruebas para medir el rendimiento de la compartición "
 "de ficheros"
 
-#: src/fs/gnunet-fs.c:128
-msgid "print a list of all indexed files"
-msgstr "imprimir una lista de todos los ficheros indexados"
-
-#: src/fs/gnunet-fs.c:141
-msgid "Special file-sharing operations"
-msgstr "Operaciones especiales de compartición de ficheros"
-
 #: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:234
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
@@ -3750,7 +3750,7 @@ msgstr ""
 "Al servicio principal le falta la configuración de la clave de máquina "
 "(HOSTKEY).  Saliendo.\n"
 
-#: src/fs/gnunet-service-fs.c:1307 src/hostlist/gnunet-daemon-hostlist.c:355
+#: src/fs/gnunet-service-fs.c:1316 src/hostlist/gnunet-daemon-hostlist.c:343
 #: src/topology/gnunet-daemon-topology.c:1098
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
@@ -3867,42 +3867,42 @@ msgid "# migration stop messages sent"
 msgstr "# mensajes de detención de migración enviados"
 
 #: src/fs/gnunet-service-fs_indexing.c:130
-#: src/fs/gnunet-service-fs_indexing.c:185
+#: src/fs/gnunet-service-fs_indexing.c:188
 #, c-format
 msgid "Could not open `%s'.\n"
 msgstr "No se pudo abrir «%s».\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:144
+#: src/fs/gnunet-service-fs_indexing.c:147
 #, c-format
 msgid "Error writing `%s'.\n"
 msgstr "Error escribiendo «%s».\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:241
+#: src/fs/gnunet-service-fs_indexing.c:244
 #, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Se produjo un fallo al eliminar el bloque defectuoso: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:314
+#: src/fs/gnunet-service-fs_indexing.c:317
 msgid "# index blocks removed: original file inaccessible"
 msgstr "# bloques de índice eliminados: fichero original inaccesible"
 
-#: src/fs/gnunet-service-fs_indexing.c:328
+#: src/fs/gnunet-service-fs_indexing.c:331
 #, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr ""
 "No se pudo acceder al fichero indexado «%s» (%s) en el desplazamiento %llu: "
 "%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:332
+#: src/fs/gnunet-service-fs_indexing.c:335
 msgid "not indexed"
 msgstr "no indexado"
 
-#: src/fs/gnunet-service-fs_indexing.c:346
+#: src/fs/gnunet-service-fs_indexing.c:349
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "El fichero indexado «%s» ha cambiado en el desplazamiento %llu\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:452
+#: src/fs/gnunet-service-fs_indexing.c:455
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -4082,72 +4082,72 @@ msgstr "Desindexa un fichero previamente indexado con «gnunet-publish»."
 msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:132
+#: src/gns/gnunet-bcd.c:133
 #, fuzzy, c-format
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr "Rechazando petición «%s» al servidor de listas de máquinas\n"
 
-#: src/gns/gnunet-bcd.c:346
+#: src/gns/gnunet-bcd.c:347
 #, fuzzy, c-format
 msgid "Invalid port number %u.  Exiting.\n"
 msgstr "Número de puerto %llu no válido.  Saliendo.\n"
 
-#: src/gns/gnunet-bcd.c:351
+#: src/gns/gnunet-bcd.c:352
 #, fuzzy, c-format
 msgid "Businesscard HTTP server starts on %u\n"
 msgstr "Servicio de listas de máquinas arranca en %s:%llu\n"
 
-#: src/gns/gnunet-bcd.c:371
+#: src/gns/gnunet-bcd.c:372
 #, fuzzy, c-format
 msgid "Could not start businesscard HTTP server on port %u\n"
 msgstr ""
 "No se pudo arrancar un servidor de listas de máquinas HTTP en el puerto %u\n"
 
-#: src/gns/gnunet-bcd.c:508
+#: src/gns/gnunet-bcd.c:509
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:521
+#: src/gns/gnunet-bcd.c:522
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:213
+#: src/gns/gnunet-dns2gns.c:239
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 "¡Se produjo un fallo al empaquetar una respuesta DNS en un paquete UDP!\n"
 
-#: src/gns/gnunet-dns2gns.c:418
+#: src/gns/gnunet-dns2gns.c:442
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr "No se puede procesar la petición DNS de %s\n"
 
-#: src/gns/gnunet-dns2gns.c:434
+#: src/gns/gnunet-dns2gns.c:458
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Recibida petición DNS mal formada de %s\n"
 
-#: src/gns/gnunet-dns2gns.c:442
+#: src/gns/gnunet-dns2gns.c:466
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Recibida petición DNS no soportada de %s\n"
 
-#: src/gns/gnunet-dns2gns.c:603
+#: src/gns/gnunet-dns2gns.c:627
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "¡Ninguna palabra clave especificada!\n"
 
-#: src/gns/gnunet-dns2gns.c:752
+#: src/gns/gnunet-dns2gns.c:776
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr "IP del resolvedor recursivo DNS a usar (requerido)"
 
-#: src/gns/gnunet-dns2gns.c:758
+#: src/gns/gnunet-dns2gns.c:782
 #, fuzzy
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 "Puerto UDP en el que escuchar para peticiones DNS entrantes; predeterminado: "
 "53"
 
-#: src/gns/gnunet-dns2gns.c:775
+#: src/gns/gnunet-dns2gns.c:799
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr "Pasarela GNUnet DNS-a-GNS (un servidor DNS)"
 
@@ -4164,6 +4164,53 @@ msgstr "¿cuánto tiempo se debe ejecutar? 0 = para siempre"
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
+#: src/gns/gnunet-gns.c:257
+#, fuzzy, c-format
+msgid "`%s' is not a valid DNS domain name\n"
+msgstr "«%s» no es una dirección IP válida.\n"
+
+#: src/gns/gnunet-gns.c:267 src/util/dnsparser.c:254
+#, c-format
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+msgstr ""
+"Se produjo un fallo al convertir el nombre en formato DNS IDNA «%s» a UTF-8: "
+"%s\n"
+
+#: src/gns/gnunet-gns.c:281
+msgid "Cannot resolve using GNS: GNUnet peer not running\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:305
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:340
+msgid "Lookup a record for the given name"
+msgstr "Buscar el registro para el nombre dado"
+
+#: src/gns/gnunet-gns.c:346
+msgid "Specify the type of the record to lookup"
+msgstr "Especificar el tipo del registro a buscar"
+
+#: src/gns/gnunet-gns.c:352
+#, fuzzy
+msgid "Specify a timeout for the lookup"
+msgstr "Especificar el tipo del registro a buscar"
+
+#: src/gns/gnunet-gns.c:356
+msgid "No unneeded output"
+msgstr "Sin salida innecesaria"
+
+#: src/gns/gnunet-gns.c:361
+msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:375
+#, fuzzy
+msgid "GNUnet GNS resolver tool"
+msgstr "Herramienta de acceso GNUnet GNS"
+
 #: src/gns/gnunet-gns-import.c:486
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
@@ -4243,94 +4290,47 @@ msgstr "No se pudo importar el certificado %s\n"
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
 
-#: src/gns/gnunet-gns-proxy.c:2922 src/rest/gnunet-rest-server.c:709
+#: src/gns/gnunet-gns-proxy.c:2922 src/rest/gnunet-rest-server.c:713
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Se produjo un fallo al conectar con GNS\n"
 
-#: src/gns/gnunet-gns-proxy.c:3268
+#: src/gns/gnunet-gns-proxy.c:3271
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:3300
+#: src/gns/gnunet-gns-proxy.c:3303
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:3386
+#: src/gns/gnunet-gns-proxy.c:3389
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Tipo de bloque %u no soportado\n"
 
-#: src/gns/gnunet-gns-proxy.c:3727
+#: src/gns/gnunet-gns-proxy.c:3730
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n"
 
-#: src/gns/gnunet-gns-proxy.c:3861
+#: src/gns/gnunet-gns-proxy.c:3864
 msgid "listen on specified port (default: 7777)"
 msgstr "escuchar en el puerto especificado (predeterminado: 7777)"
 
-#: src/gns/gnunet-gns-proxy.c:3866
+#: src/gns/gnunet-gns-proxy.c:3869
 msgid "pem file to use as CA"
 msgstr "fichero pem para usar como autoridad de certificación (CA)"
 
-#: src/gns/gnunet-gns-proxy.c:3870
+#: src/gns/gnunet-gns-proxy.c:3873
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3896
+#: src/gns/gnunet-gns-proxy.c:3899
 msgid "GNUnet GNS proxy"
 msgstr "Proxy GNUnet GNS"
 
-#: src/gns/gnunet-gns.c:253
-#, fuzzy, c-format
-msgid "`%s' is not a valid DNS domain name\n"
-msgstr "«%s» no es una dirección IP válida.\n"
-
-#: src/gns/gnunet-gns.c:263 src/util/dnsparser.c:254
-#, c-format
-msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
-msgstr ""
-"Se produjo un fallo al convertir el nombre en formato DNS IDNA «%s» a UTF-8: "
-"%s\n"
-
-#: src/gns/gnunet-gns.c:277
-msgid "Cannot resolve using GNS: GNUnet peer not running\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:301
-#, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:336
-msgid "Lookup a record for the given name"
-msgstr "Buscar el registro para el nombre dado"
-
-#: src/gns/gnunet-gns.c:342
-msgid "Specify the type of the record to lookup"
-msgstr "Especificar el tipo del registro a buscar"
-
-#: src/gns/gnunet-gns.c:348
-#, fuzzy
-msgid "Specify a timeout for the lookup"
-msgstr "Especificar el tipo del registro a buscar"
-
-#: src/gns/gnunet-gns.c:352
-msgid "No unneeded output"
-msgstr "Sin salida innecesaria"
-
-#: src/gns/gnunet-gns.c:357
-msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:371
-#, fuzzy
-msgid "GNUnet GNS resolver tool"
-msgstr "Herramienta de acceso GNUnet GNS"
-
 #: src/gns/gnunet-service-gns.c:505
 #, fuzzy
 msgid "Properly base32-encoded public key required"
@@ -4342,8 +4342,8 @@ msgid "Failed to connect to the namecache!\n"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
 #: src/gns/gnunet-service-gns.c:560
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:444
 #: src/zonemaster/gnunet-service-zonemaster.c:887
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:444
 msgid "Could not connect to DHT!\n"
 msgstr "¡No se pudo conectar a la DHT!\n"
 
@@ -4372,51 +4372,51 @@ msgstr ""
 msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr "Módulo «%s» no encontrado\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:932
+#: src/gns/gnunet-service-gns_resolver.c:938
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1123
+#: src/gns/gnunet-service-gns_resolver.c:1129
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1439
+#: src/gns/gnunet-service-gns_resolver.c:1447
 #, fuzzy, c-format
 msgid "VPN returned empty result for `%s'\n"
 msgstr "El ATS devolvió resultados para %u direcciones\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1896
+#: src/gns/gnunet-service-gns_resolver.c:1909
 #, c-format
 msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1909
+#: src/gns/gnunet-service-gns_resolver.c:1922
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1952
+#: src/gns/gnunet-service-gns_resolver.c:1965
 #, fuzzy, c-format
 msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr "No se han encontrado ficheros en «%s»\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2376
+#: src/gns/gnunet-service-gns_resolver.c:2385
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2399
+#: src/gns/gnunet-service-gns_resolver.c:2408
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Se produjo un fallo al mandar la petición DNS a %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2567
+#: src/gns/gnunet-service-gns_resolver.c:2576
 #, c-format
 msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2707
+#: src/gns/gnunet-service-gns_resolver.c:2716
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
@@ -4448,7 +4448,7 @@ msgstr "No se pudo procesar la cadena de registro VPN «%s»\n"
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "No se pudo procesar la cadena de registro VPN «%s»\n"
 
-#: src/gns/plugin_rest_gns.c:443
+#: src/gns/plugin_rest_gns.c:445
 #, fuzzy
 msgid "Gns REST API initialized\n"
 msgstr "Conexión fallida\n"
@@ -4613,7 +4613,7 @@ msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr ""
 "Se produjo un fallo al procesar «%s» como una dirección para el módulo «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:316
+#: src/hostlist/gnunet-daemon-hostlist.c:306
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
@@ -4621,11 +4621,11 @@ msgstr ""
 "Ninguna de las funciones para el demonio de listas de máquinas fue "
 "activada.  ¡No tengo razón para ejecutarme!\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:377
+#: src/hostlist/gnunet-daemon-hostlist.c:364
 msgid "advertise our hostlist to other peers"
 msgstr "anuncia nuestra lista de máquinas a otros pares"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:383
+#: src/hostlist/gnunet-daemon-hostlist.c:369
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
@@ -4633,16 +4633,16 @@ msgstr ""
 "realizar inicialización usando listas de máquinas (es altamente recomendable "
 "que siempre se use esta opción)"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:388
+#: src/hostlist/gnunet-daemon-hostlist.c:374
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 "habilitar aprendizaje de servidores de listas de máquinas de otros pares"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:393
+#: src/hostlist/gnunet-daemon-hostlist.c:378
 msgid "provide a hostlist server"
 msgstr "proveer un servidor de listas de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:409
+#: src/hostlist/gnunet-daemon-hostlist.c:393
 msgid "GNUnet hostlist server and client"
 msgstr "Servidor y cliente GNUnet de listas de máquinas"
 
@@ -4666,7 +4666,7 @@ msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# «HELLO» válidos descargados de servidores de listas de máquinas"
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:677
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1455
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1459
 msgid "# advertised hostlist URIs"
 msgstr "# URI de listas de máquinas anunciadas"
 
@@ -4720,7 +4720,7 @@ msgid "# hostlist downloads initiated"
 msgstr "# descargas de listas de máquinas iniciadas"
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1144
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1715
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1726
 msgid "# milliseconds between hostlist downloads"
 msgstr "# milisegundos entre descargas de listas de máquinas"
 
@@ -4752,52 +4752,52 @@ msgstr ""
 "No se pudo abrir el fichero «%s» en modo lectura para cargar las listas de "
 "máquinas: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1448
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1452
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr "%u URI de listas de máquinas cargadas del fichero\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1451
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1455
 msgid "# hostlist URIs read from file"
 msgstr "# URI de listas de máquinas leídas de fichero"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1502
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1506
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 "No se pudo abrir el fichero «%s» en modo escritura para almacenar las listas "
 "de máquinas: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1509
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1513
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Escribiendo %u URI de listas de máquinas a «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1534
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1553
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1545
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1564
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr "Error escribiendo URI de listas de máquinas al fichero «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1547
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1558
 msgid "# hostlist URIs written to file"
 msgstr "# URI de listas de máquinas escritas a fichero"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1644
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1655
 #: src/transport/plugin_transport_http_client.c:2301
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1673
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1684
 msgid "Learning is enabled on this peer\n"
 msgstr "El aprendizaje está habilitado en este par\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1686
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1697
 msgid "Learning is not enabled on this peer\n"
 msgstr "El aprendizaje no está habilitado en este par\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1700
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1711
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
@@ -4805,16 +4805,16 @@ msgstr ""
 "La lista de máquinas «%s» fue eliminada puesto que el aprendizaje no está "
 "habilitado en este par\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:172
+#: src/hostlist/gnunet-daemon-hostlist_server.c:173
 msgid "bytes in hostlist"
 msgstr "bytes en la lista de máquinas"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:198
+#: src/hostlist/gnunet-daemon-hostlist_server.c:199
 msgid "expired addresses encountered"
 msgstr "direcciones expiradas encontradas"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:235
-#: src/hostlist/gnunet-daemon-hostlist_server.c:526
+#: src/hostlist/gnunet-daemon-hostlist_server.c:236
+#: src/hostlist/gnunet-daemon-hostlist_server.c:527
 #: src/peerinfo-tool/gnunet-peerinfo.c:379
 #: src/peerinfo-tool/gnunet-peerinfo.c:515
 #: src/topology/gnunet-daemon-topology.c:799
@@ -4824,132 +4824,137 @@ msgstr ""
 "Error en la comunicación con el servicio de información de pares (PEERINFO): "
 "%s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:256
+#: src/hostlist/gnunet-daemon-hostlist_server.c:257
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr "«HELLO» sin dirección encontrados (ignorados)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:274
+#: src/hostlist/gnunet-daemon-hostlist_server.c:275
 msgid "bytes not included in hostlist (size limit)"
 msgstr "bytes no incluidos en la lista de máquinas (límite de tamaño)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:376
+#: src/hostlist/gnunet-daemon-hostlist_server.c:377
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr "Rechazando petición «%s» al servidor de listas de máquinas\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:380
+#: src/hostlist/gnunet-daemon-hostlist_server.c:381
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr "Peticiones de listas de máquinas rechazadas (no HTTP GET)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:393
+#: src/hostlist/gnunet-daemon-hostlist_server.c:394
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr "Rechazando petición «%s» con %llu bytes de datos de subida\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:398
+#: src/hostlist/gnunet-daemon-hostlist_server.c:399
 msgid "hostlist requests refused (upload data)"
 msgstr "Peticiones de listas de máquinas rechazadas (datos de subida)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:408
+#: src/hostlist/gnunet-daemon-hostlist_server.c:409
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 "No se pudo manejar una petición de lista de máquinas debido a que no hay una "
 "respuesta todavía\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:411
+#: src/hostlist/gnunet-daemon-hostlist_server.c:412
 msgid "hostlist requests refused (not ready)"
 msgstr "Peticiones de listas de máquinas rechazadas (no preparados)"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:417
+#: src/hostlist/gnunet-daemon-hostlist_server.c:418
 msgid "Received request for our hostlist\n"
 msgstr "Peticiones recibidas de nuestra lista de máquinas\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:419
+#: src/hostlist/gnunet-daemon-hostlist_server.c:420
 msgid "hostlist requests processed"
 msgstr "Peticiones de lista de máquinas procesadas"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:460
+#: src/hostlist/gnunet-daemon-hostlist_server.c:461
 msgid "# hostlist advertisements send"
 msgstr "# anuncios de listas de máquinas enviados"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:673
-#: src/transport/gnunet-service-transport.c:2657
+#: src/hostlist/gnunet-daemon-hostlist_server.c:674
+#: src/transport/gnunet-service-transport.c:2659
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 "No se pudo acceder al servicio de información de pares (PEERINFO).  "
 "Saliendo.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:684
+#: src/hostlist/gnunet-daemon-hostlist_server.c:685
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Número de puerto %llu no válido.  Saliendo.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:696
+#: src/hostlist/gnunet-daemon-hostlist_server.c:697
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr "Servicio de listas de máquinas arranca en %s:%llu\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:713
+#: src/hostlist/gnunet-daemon-hostlist_server.c:714
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Dirección para obtener la lista de máquinas: «%s»\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:728
+#: src/hostlist/gnunet-daemon-hostlist_server.c:729
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:742
+#: src/hostlist/gnunet-daemon-hostlist_server.c:743
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:764
+#: src/hostlist/gnunet-daemon-hostlist_server.c:765
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:785
+#: src/hostlist/gnunet-daemon-hostlist_server.c:786
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "¡«%s» no es una dirección IP válida! Ignorando «BINDTOIP».\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:828
+#: src/hostlist/gnunet-daemon-hostlist_server.c:829
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 "No se pudo arrancar un servidor de listas de máquinas HTTP en el puerto %u\n"
 
-#: src/identity/gnunet-identity.c:193
+#: src/identity/gnunet-identity.c:209
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/identity/gnunet-identity.c:233
+#: src/identity/gnunet-identity.c:250
 #, fuzzy, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/identity/gnunet-identity.c:391
+#: src/identity/gnunet-identity.c:445
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:396
+#: src/identity/gnunet-identity.c:450
 #, fuzzy
 msgid "delete ego NAME "
 msgstr "borrar un nombre de espacio de nombres (NAME)"
 
-#: src/identity/gnunet-identity.c:400
+#: src/identity/gnunet-identity.c:455
+msgid ""
+"set the private key for the identity to PRIVATE_KEY (use together with -C)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:459
 #, fuzzy
 msgid "display all egos"
 msgstr "mostrar registros"
 
-#: src/identity/gnunet-identity.c:404
+#: src/identity/gnunet-identity.c:463
 #, fuzzy
 msgid "reduce output"
 msgstr "Sin salida innecesaria"
 
-#: src/identity/gnunet-identity.c:411
+#: src/identity/gnunet-identity.c:470
 msgid ""
 "set default identity to NAME for a subsystem SUBSYSTEM (use together with -"
 "s) or restrict results to NAME (use together with -d)"
@@ -4957,74 +4962,74 @@ msgstr ""
 
 # Miguel: Aquí he dejado monitorización porque esto es
 # del servicio de traducción de direcciones.
-#: src/identity/gnunet-identity.c:415
+#: src/identity/gnunet-identity.c:474
 #, fuzzy
 msgid "run in monitor mode egos"
 msgstr "modo de monitorización"
 
-#: src/identity/gnunet-identity.c:419
+#: src/identity/gnunet-identity.c:478
 msgid "display private keys as well"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:426
+#: src/identity/gnunet-identity.c:485
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:438
+#: src/identity/gnunet-identity.c:500
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:484
+#: src/identity/gnunet-service-identity.c:503
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:507
+#: src/identity/gnunet-service-identity.c:528
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:597
-#: src/identity/gnunet-service-identity.c:871
-#: src/identity/gnunet-service-identity.c:991
+#: src/identity/gnunet-service-identity.c:621
+#: src/identity/gnunet-service-identity.c:898
+#: src/identity/gnunet-service-identity.c:1018
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr ""
 "Se produjo un fallo al obtener los identificadores de fichero para «%s»\n"
 
-#: src/identity/gnunet-service-identity.c:607
+#: src/identity/gnunet-service-identity.c:631
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:700
+#: src/identity/gnunet-service-identity.c:726
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:847
+#: src/identity/gnunet-service-identity.c:874
 #, fuzzy
 msgid "target name already exists"
 msgstr "El registro ya existía en el almacén de nombres"
 
-#: src/identity/gnunet-service-identity.c:889
-#: src/identity/gnunet-service-identity.c:1009
+#: src/identity/gnunet-service-identity.c:916
+#: src/identity/gnunet-service-identity.c:1035
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:1043
+#: src/identity/gnunet-service-identity.c:1072
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Se produjo un fallo al procesar la identidad del par «%s»\n"
 
-#: src/identity/gnunet-service-identity.c:1099
+#: src/identity/gnunet-service-identity.c:1130
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/identity/gnunet-service-identity.c:1108
+#: src/identity/gnunet-service-identity.c:1139
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Se produjo un fallo al leer el directorio «%s»\n"
 
-#: src/identity/plugin_rest_identity.c:1359
+#: src/identity/plugin_rest_identity.c:1406
 #, fuzzy
 msgid "Identity REST API initialized\n"
 msgstr "Conexión fallida\n"
@@ -5074,7 +5079,7 @@ msgstr "Parámetro no válido «%s»\n"
 msgid "You must specify a name\n"
 msgstr "¡Debes especificar un receptor!\n"
 
-#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:1608
+#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:1639
 msgid "name of the record to add/delete/display"
 msgstr "nombre del registro a añadir/borrar/mostrar"
 
@@ -5083,7 +5088,7 @@ msgstr "nombre del registro a añadir/borrar/mostrar"
 msgid "specifies the public key of the zone to look in"
 msgstr "Especificar el tipo del registro a buscar"
 
-#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:1669
+#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:1700
 msgid "GNUnet zone manipulation tool"
 msgstr "Herramienta de manipulación de zona de GNUnet"
 
@@ -5134,71 +5139,6 @@ msgstr "Base de datos sqlite ejecutándose\n"
 msgid "Failed to setup database at `%s'\n"
 msgstr "Se produjo un fallo al inciar «%s» en «%s»\n"
 
-# form??
-#: src/namestore/gnunet-namestore-fcfsd.c:551
-#, c-format
-msgid "Unsupported form value `%s'\n"
-msgstr "Forma de valor no soportada «%s»\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:578
-#, c-format
-msgid "Failed to create record for domain `%s': %s\n"
-msgstr "Se produjo un fallo al crear un registro para el dominio «%s»: %s\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:599
-msgid "Error when mapping zone to name\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:631
-#, c-format
-msgid "Found existing name `%s' for the given key\n"
-msgstr "Encontrado nombre «%s» para la clave dada\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:693
-#, c-format
-msgid "Found %u existing records for domain `%s'\n"
-msgstr "Encontrados %u registros para el dominio «%s»\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:783
-#, c-format
-msgid "Failed to create page for `%s'\n"
-msgstr "Se produjo un fallo al crear la página para «%s»\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:802
-#, c-format
-msgid "Failed to setup post processor for `%s'\n"
-msgstr "Se produjo un fallo al configurar el post-procesador para «%s»\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:839
-msgid "Domain name must not contain `.'\n"
-msgstr "El nombre de dominio no puede contener «.»\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:848
-msgid "Domain name must not contain `+'\n"
-msgstr "El nombre de dominio no puede contener «+»\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1083
-msgid "No ego configured for `fcfsd` subsystem\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1114
-msgid "Failed to start HTTP server\n"
-msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1162
-#, fuzzy
-msgid "Failed to connect to identity\n"
-msgstr "Se produjo un fallo al conectar con GNS\n"
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1189
-msgid "name of the zone that is to be managed by FCFSD"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1209
-#, fuzzy
-msgid "GNU Name System First Come First Serve name registration service"
-msgstr "Servicio de registro GNUnet GNS primero en llegar, primero en servirse"
-
 #: src/namestore/gnunet-namestore.c:334
 #, c-format
 msgid "Adding record failed: %s\n"
@@ -5258,9 +5198,10 @@ msgstr "Se produjo un fallo al procesar la petición DNS.  Omitiendo.\n"
 msgid "No options given\n"
 msgstr "No se han proporcionado opciones\n"
 
-#: src/namestore/gnunet-namestore.c:1014 src/namestore/gnunet-namestore.c:1047
-#: src/namestore/gnunet-namestore.c:1057 src/namestore/gnunet-namestore.c:1075
-#: src/namestore/gnunet-namestore.c:1096 src/namestore/gnunet-namestore.c:1123
+#: src/namestore/gnunet-namestore.c:1014 src/namestore/gnunet-namestore.c:1065
+#: src/namestore/gnunet-namestore.c:1075 src/namestore/gnunet-namestore.c:1104
+#: src/namestore/gnunet-namestore.c:1125 src/namestore/gnunet-namestore.c:1152
+#: src/namestore/gnunet-namestore.c:1228
 #, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Falta la opción «%s» para la operación «%s»\n"
@@ -5269,52 +5210,58 @@ msgstr "Falta la opción «%s» para la operación «%s»\n"
 msgid "replace"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1049 src/namestore/gnunet-namestore.c:1059
-#: src/namestore/gnunet-namestore.c:1077 src/namestore/gnunet-namestore.c:1098
+#: src/namestore/gnunet-namestore.c:1045
+#, fuzzy, c-format
+msgid "Invalid nick `%s'\n"
+msgstr "URI no válida: «%s»\n"
+
+#: src/namestore/gnunet-namestore.c:1067 src/namestore/gnunet-namestore.c:1077
+#: src/namestore/gnunet-namestore.c:1106 src/namestore/gnunet-namestore.c:1127
+#: src/namestore/gnunet-namestore.c:1230
 msgid "add"
 msgstr "añadir"
 
-#: src/namestore/gnunet-namestore.c:1067
+#: src/namestore/gnunet-namestore.c:1085
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Tipo no soportado «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1086
+#: src/namestore/gnunet-namestore.c:1095
+#, c-format
+msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1115
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "Valor «%s» no válido para el tipo de registro «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1105
+#: src/namestore/gnunet-namestore.c:1134 src/namestore/gnunet-namestore.c:1237
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1125
+#: src/namestore/gnunet-namestore.c:1154
 msgid "del"
 msgstr "borrar"
 
-#: src/namestore/gnunet-namestore.c:1168
+#: src/namestore/gnunet-namestore.c:1197
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1191
+#: src/namestore/gnunet-namestore.c:1220
 #: src/peerinfo-tool/gnunet-peerinfo.c:736
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "URI no válida: «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1217
-#, fuzzy, c-format
-msgid "Invalid nick `%s'\n"
-msgstr "URI no válida: «%s»\n"
-
-#: src/namestore/gnunet-namestore.c:1259
+#: src/namestore/gnunet-namestore.c:1290
 #, c-format
 msgid "Label `%s' contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1309
+#: src/namestore/gnunet-namestore.c:1340
 #, c-format
 msgid ""
 "No default identity configured for `namestore' subsystem\n"
@@ -5322,109 +5269,174 @@ msgid ""
 "Run gnunet-identity -d to get a list of choices for $NAME\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1374
+#: src/namestore/gnunet-namestore.c:1405
 #, fuzzy, c-format
 msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr "Argumentos superfluos (ignorados).\n"
 
-#: src/namestore/gnunet-namestore.c:1403
+#: src/namestore/gnunet-namestore.c:1434
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "¡No se pudo conectar al servicio %s!\n"
 
-#: src/namestore/gnunet-namestore.c:1450
+#: src/namestore/gnunet-namestore.c:1481
 msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1462
+#: src/namestore/gnunet-namestore.c:1493
 #, c-format
 msgid "Invalid expiration time `%s' (must be without unit)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1474 src/namestore/gnunet-namestore.c:1490
-#: src/namestore/gnunet-namestore.c:1507
+#: src/namestore/gnunet-namestore.c:1505 src/namestore/gnunet-namestore.c:1521
+#: src/namestore/gnunet-namestore.c:1538
 #, fuzzy, c-format
 msgid "Missing entries in record line `%s'.\n"
 msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1482
+#: src/namestore/gnunet-namestore.c:1513
 #, fuzzy, c-format
 msgid "Unknown record type `%s'\n"
 msgstr "Comando desconocido «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1520
+#: src/namestore/gnunet-namestore.c:1551
 #, fuzzy, c-format
 msgid "Invalid record data for type %s: `%s'.\n"
 msgstr "Formato no válido para la IP: «%s»\n"
 
-#: src/namestore/gnunet-namestore.c:1577
+#: src/namestore/gnunet-namestore.c:1608
 msgid "add record"
 msgstr "añadir registro"
 
-#: src/namestore/gnunet-namestore.c:1580
+#: src/namestore/gnunet-namestore.c:1611
 msgid "delete record"
 msgstr "borrar registro"
 
-#: src/namestore/gnunet-namestore.c:1584
+#: src/namestore/gnunet-namestore.c:1615
 msgid "display records"
 msgstr "mostrar registros"
 
-#: src/namestore/gnunet-namestore.c:1591
+#: src/namestore/gnunet-namestore.c:1622
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 "tiempo de expiración del registro a usar (únicamente para añadir), nunca "
 "(\"never\") es posible"
 
-#: src/namestore/gnunet-namestore.c:1597
+#: src/namestore/gnunet-namestore.c:1628
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "establece el nivel LEVEL deseado de replicación"
 
-#: src/namestore/gnunet-namestore.c:1602
+#: src/namestore/gnunet-namestore.c:1633
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
-#: src/namestore/gnunet-namestore.c:1614
+#: src/namestore/gnunet-namestore.c:1645
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "establece las preferencias para el par dado"
 
-#: src/namestore/gnunet-namestore.c:1621
+#: src/namestore/gnunet-namestore.c:1652
 msgid ""
 "set record set to values given by (possibly multiple) RECORDLINES; can be "
 "specified multiple times"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1627
+#: src/namestore/gnunet-namestore.c:1658
 msgid "type of the record to add/delete/display"
 msgstr "tipo del registro a añadir/borrar/mostrar"
 
-#: src/namestore/gnunet-namestore.c:1632
+#: src/namestore/gnunet-namestore.c:1663
 msgid "URI to import into our zone"
 msgstr "URI a importar a nuestra zona"
 
-#: src/namestore/gnunet-namestore.c:1638
+#: src/namestore/gnunet-namestore.c:1669
 msgid "value of the record to add/delete"
 msgstr "valor del registro a añadir/borrar"
 
-#: src/namestore/gnunet-namestore.c:1642
+#: src/namestore/gnunet-namestore.c:1673
 msgid "create or list public record"
 msgstr "crear o listar registros públicos"
 
-#: src/namestore/gnunet-namestore.c:1648
+#: src/namestore/gnunet-namestore.c:1679
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1654
+#: src/namestore/gnunet-namestore.c:1685
 #, fuzzy
 msgid "name of the ego controlling the zone"
 msgstr "nombre de la sección a la que acceder"
 
-#: src/namestore/gnunet-service-namestore.c:864
+# form??
+#: src/namestore/gnunet-namestore-fcfsd.c:552
+#, c-format
+msgid "Unsupported form value `%s'\n"
+msgstr "Forma de valor no soportada «%s»\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:579
+#, c-format
+msgid "Failed to create record for domain `%s': %s\n"
+msgstr "Se produjo un fallo al crear un registro para el dominio «%s»: %s\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:600
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:632
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
+msgstr "Encontrado nombre «%s» para la clave dada\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:694
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
+msgstr "Encontrados %u registros para el dominio «%s»\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:784
+#, c-format
+msgid "Failed to create page for `%s'\n"
+msgstr "Se produjo un fallo al crear la página para «%s»\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:803
+#, c-format
+msgid "Failed to setup post processor for `%s'\n"
+msgstr "Se produjo un fallo al configurar el post-procesador para «%s»\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:840
+msgid "Domain name must not contain `.'\n"
+msgstr "El nombre de dominio no puede contener «.»\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:849
+msgid "Domain name must not contain `+'\n"
+msgstr "El nombre de dominio no puede contener «+»\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1084
+msgid "No ego configured for `fcfsd` subsystem\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1115
+msgid "Failed to start HTTP server\n"
+msgstr "Se produjo un fallo al iniciar el servidor HTTP\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1163
+#, fuzzy
+msgid "Failed to connect to identity\n"
+msgstr "Se produjo un fallo al conectar con GNS\n"
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1190
+msgid "name of the zone that is to be managed by FCFSD"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1210
+#, fuzzy
+msgid "GNU Name System First Come First Serve name registration service"
+msgstr "Servicio de registro GNUnet GNS primero en llegar, primero en servirse"
+
+#: src/namestore/gnunet-service-namestore.c:866
 #, fuzzy, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr "Se produjo un fallo al crear el espacio de nombres «%s»\n"
@@ -5457,7 +5469,7 @@ msgstr ""
 msgid "Flat file database running\n"
 msgstr "Base de datos de plantilla ejecutándose\n"
 
-#: src/namestore/plugin_rest_namestore.c:925
+#: src/namestore/plugin_rest_namestore.c:1093
 #, fuzzy
 msgid "Namestore REST API initialized\n"
 msgstr "Conexión fallida\n"
@@ -5757,6 +5769,11 @@ msgstr "comando «external-ip» no encontrado\n"
 msgid "`upnpc' command not found\n"
 msgstr "comando «upnpc» no encontrado\n"
 
+#: src/nse/gnunet-nse.c:124
+#, fuzzy
+msgid "Show network size estimates from NSE service."
+msgstr "# Estimaciones del tamaño de red recibidas"
+
 #: src/nse/gnunet-nse-profiler.c:857
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr "límite al número de conexiones a servicios NSE, 0 para ilimitadas"
@@ -5782,16 +5799,70 @@ msgstr "retraso entre rondas"
 msgid "Measure quality and performance of the NSE service."
 msgstr "Medir la calidad y rendimiento del servicio NSE."
 
-#: src/nse/gnunet-nse.c:124
-#, fuzzy
-msgid "Show network size estimates from NSE service."
-msgstr "# Estimaciones del tamaño de red recibidas"
-
-#: src/nse/gnunet-service-nse.c:1437
-#: src/revocation/gnunet-service-revocation.c:846 src/util/gnunet-scrypt.c:247
+#: src/nse/gnunet-service-nse.c:1438
+#: src/revocation/gnunet-service-revocation.c:842 src/util/gnunet-scrypt.c:250
 msgid "Value is too large.\n"
 msgstr ""
 
+#: src/peerinfo/gnunet-service-peerinfo.c:175
+#, c-format
+msgid "Removing expired address of transport `%s'\n"
+msgstr "Eliminando dirección de transporte «%s»\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:306
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s': %s\n"
+msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:323
+#: src/peerinfo/gnunet-service-peerinfo.c:348
+#, fuzzy, c-format
+msgid "Failed to parse HELLO in file `%s'\n"
+msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:426
+msgid "# peers known"
+msgstr "# pares conocidos"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:468
+#, c-format
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr ""
+"El fichero «%s» en el directorio «%s» no sigue la convención de nombres. "
+"Eliminado.\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:624
+#, fuzzy, c-format
+msgid "Scanning directory `%s'\n"
+msgstr "Escaneando directorio «%s».\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:631
+#, c-format
+msgid "Still no peers found in `%s'!\n"
+msgstr "¡Aún no se han encontrado pares en «%s»!\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1024
+#, fuzzy, c-format
+msgid "Cleaning up directory `%s'\n"
+msgstr "Escaneando directorio «%s».\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1319
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
+msgstr "Importando HELLO de «%s»\n"
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1332
+msgid "Skipping import of included HELLOs\n"
+msgstr ""
+
+# Miguel: "Failed to receive" también aquí está traducido como
+# "no se obtuvo respuesta" por claridad.
+#: src/peerinfo/peerinfo_api.c:217
+msgid "Failed to receive response from `PEERINFO' service."
+msgstr ""
+"No se obtuvo respuesta del servicio de información de pares (PEERINFO)."
+
 #: src/peerinfo-tool/gnunet-peerinfo.c:237
 #, fuzzy, c-format
 msgid "%sPeer `%s'\n"
@@ -5803,7 +5874,7 @@ msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:292
-#: src/peerinfo-tool/plugin_rest_peerinfo.c:499
+#: src/peerinfo-tool/plugin_rest_peerinfo.c:501
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "Se produjo un fallo al resolver la dirección para el par «%s»\n"
@@ -5882,70 +5953,11 @@ msgstr "Cargando el módulo de transporte «%s»\n"
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
 
-#: src/peerinfo-tool/plugin_rest_peerinfo.c:795
+#: src/peerinfo-tool/plugin_rest_peerinfo.c:797
 #, fuzzy
 msgid "Peerinfo REST API initialized\n"
 msgstr "Conexión fallida\n"
 
-#: src/peerinfo/gnunet-service-peerinfo.c:175
-#, c-format
-msgid "Removing expired address of transport `%s'\n"
-msgstr "Eliminando dirección de transporte «%s»\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:306
-#, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s': %s\n"
-msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:323
-#: src/peerinfo/gnunet-service-peerinfo.c:348
-#, fuzzy, c-format
-msgid "Failed to parse HELLO in file `%s'\n"
-msgstr "Se produjo un fallo al procesar «HELLO» en el fichero «%s»\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:426
-msgid "# peers known"
-msgstr "# pares conocidos"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:468
-#, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
-msgstr ""
-"El fichero «%s» en el directorio «%s» no sigue la convención de nombres. "
-"Eliminado.\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:624
-#, fuzzy, c-format
-msgid "Scanning directory `%s'\n"
-msgstr "Escaneando directorio «%s».\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:631
-#, c-format
-msgid "Still no peers found in `%s'!\n"
-msgstr "¡Aún no se han encontrado pares en «%s»!\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1024
-#, fuzzy, c-format
-msgid "Cleaning up directory `%s'\n"
-msgstr "Escaneando directorio «%s».\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1319
-#, c-format
-msgid "Importing HELLOs from `%s'\n"
-msgstr "Importando HELLO de «%s»\n"
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1332
-msgid "Skipping import of included HELLOs\n"
-msgstr ""
-
-# Miguel: "Failed to receive" también aquí está traducido como
-# "no se obtuvo respuesta" por claridad.
-#: src/peerinfo/peerinfo_api.c:217
-msgid "Failed to receive response from `PEERINFO' service."
-msgstr ""
-"No se obtuvo respuesta del servicio de información de pares (PEERINFO)."
-
 #: src/peerstore/gnunet-peerstore.c:92
 msgid "peerstore"
 msgstr ""
@@ -6050,85 +6062,97 @@ msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 "Demonio a ejecutar para realizar la traducción de protocolo IP a GNUnet"
 
-#: src/reclaim/gnunet-reclaim.c:617
+#: src/reclaim/gnunet-reclaim.c:799
 #, fuzzy, c-format
 msgid "Ego is required\n"
 msgstr "Las opción «%s» o «%s» es necesaria.\n"
 
-#: src/reclaim/gnunet-reclaim.c:624
+#: src/reclaim/gnunet-reclaim.c:806
 #, c-format
 msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:631
+#: src/reclaim/gnunet-reclaim.c:813
 #, fuzzy, c-format
 msgid "Requesting party key is required!\n"
 msgstr "el parámetro --section es necesario\n"
 
-#: src/reclaim/gnunet-reclaim.c:649
+#: src/reclaim/gnunet-reclaim.c:831
 msgid "Add an attribute NAME"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:654
+#: src/reclaim/gnunet-reclaim.c:836
 msgid "Delete the attribute with ID"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:659
+#: src/reclaim/gnunet-reclaim.c:841
 msgid "The attribute VALUE"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:664
+#: src/reclaim/gnunet-reclaim.c:846
 #, fuzzy
 msgid "The EGO to use"
 msgstr "tamaño del mensaje"
 
-#: src/reclaim/gnunet-reclaim.c:670
+#: src/reclaim/gnunet-reclaim.c:852
 msgid "Specify the relying party for issue"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:674
+#: src/reclaim/gnunet-reclaim.c:856
 msgid "List attributes for EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:681
+#: src/reclaim/gnunet-reclaim.c:860
+msgid "List attestations for EGO"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:866
+msgid "Attestation to use for attribute"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:871
+msgid "Attestation name"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:877
 msgid "Issue a ticket for a set of attributes separated by comma"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:686
+#: src/reclaim/gnunet-reclaim.c:882
 msgid "Consume a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:691
+#: src/reclaim/gnunet-reclaim.c:887
 msgid "Revoke a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:696
+#: src/reclaim/gnunet-reclaim.c:892
 msgid "Type of attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:700
+#: src/reclaim/gnunet-reclaim.c:896
 msgid "List tickets of ego"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:706
+#: src/reclaim/gnunet-reclaim.c:902
 msgid "Expiration interval of the attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:714
+#: src/reclaim/gnunet-reclaim.c:910
 msgid "re:claimID command line tool"
 msgstr ""
 
-#: src/reclaim/plugin_rest_openid_connect.c:2340
+#: src/reclaim/plugin_rest_openid_connect.c:2481
 #, fuzzy
 msgid "OpenID Connect REST API initialized\n"
 msgstr "Conexión fallida\n"
 
-#: src/reclaim/plugin_rest_reclaim.c:1899
+#: src/reclaim/plugin_rest_reclaim.c:1476
 #, fuzzy
 msgid "Identity Provider REST API initialized\n"
 msgstr "Conexión fallida\n"
 
-#: src/reclaim/reclaim_api.c:436
+#: src/reclaim/reclaim_api.c:540
 #, fuzzy
 msgid "failed to store record\n"
 msgstr "El almacén de nombres no pudo añadir el registro\n"
@@ -6228,12 +6252,12 @@ msgstr "El servicio «%s» no está ejecutandose\n"
 msgid "Search string `%s' is too long!\n"
 msgstr "El servicio «%s» no está ejecutandose\n"
 
-#: src/rest/gnunet-rest-server.c:1047
+#: src/rest/gnunet-rest-server.c:1051
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "Herramienta de acceso GNUnet GNS"
 
-#: src/rest/plugin_rest_config.c:401
+#: src/rest/plugin_rest_config.c:402
 #, fuzzy
 msgid "CONFIG REST API initialized\n"
 msgstr "Conexión fallida\n"
@@ -6243,146 +6267,176 @@ msgstr "Conexión fallida\n"
 msgid "COPYING REST API initialized\n"
 msgstr "Conexión fallida\n"
 
-#: src/revocation/gnunet-revocation.c:127
+#: src/revocation/gnunet-revocation.c:114
+#, fuzzy
+msgid "Shutting down...\n"
+msgstr "Iniciando descarga «%s».\n"
+
+#: src/revocation/gnunet-revocation.c:146
 #, fuzzy, c-format
 msgid "Key `%s' is valid\n"
 msgstr "Formato del pseudónimo '%s' no es válido.\n"
 
 # Miguel: ¿Quizá fuese mejor «Se ha parado el servicio x»?
 # Esto también es aplicable a las siguientes traducciones.
-#: src/revocation/gnunet-revocation.c:131
+#: src/revocation/gnunet-revocation.c:150
 #, fuzzy, c-format
 msgid "Key `%s' has been revoked\n"
 msgstr "El servicio «%s» se ha parado.\n"
 
-#: src/revocation/gnunet-revocation.c:135
+#: src/revocation/gnunet-revocation.c:154
 #, fuzzy
 msgid "Internal error\n"
 msgstr "Error interno."
 
-#: src/revocation/gnunet-revocation.c:161
+#: src/revocation/gnunet-revocation.c:180
 #, c-format
 msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:164
+#: src/revocation/gnunet-revocation.c:183
 #, fuzzy
 msgid "Revocation failed (!)\n"
 msgstr "La operación ha fallado.\n"
 
-#: src/revocation/gnunet-revocation.c:170
+#: src/revocation/gnunet-revocation.c:189
 #, c-format
 msgid "Key for ego `%s' has been successfully revoked\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:173
+#: src/revocation/gnunet-revocation.c:192
 msgid "Revocation successful.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:179
+#: src/revocation/gnunet-revocation.c:198
 msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:312
+#: src/revocation/gnunet-revocation.c:251
+msgid "Cancelling calculation.\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:296
 #, c-format
 msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:338
+#: src/revocation/gnunet-revocation.c:335
 #, fuzzy, c-format
 msgid "Ego `%s' not found.\n"
 msgstr "Módulo «%s» no encontrado\n"
 
-#: src/revocation/gnunet-revocation.c:351
+#: src/revocation/gnunet-revocation.c:349
 #, c-format
 msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:368
+#: src/revocation/gnunet-revocation.c:359
 msgid "Revocation certificate ready\n"
 msgstr ""
 
+#: src/revocation/gnunet-revocation.c:371
+msgid "Continuing calculation where left off...\n"
+msgstr ""
+
 #: src/revocation/gnunet-revocation.c:378
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:409
+#: src/revocation/gnunet-revocation.c:416
 #, fuzzy, c-format
 msgid "Public key `%s' malformed\n"
 msgstr "El bloque del tipo %u está mal formado\n"
 
-#: src/revocation/gnunet-revocation.c:419
+#: src/revocation/gnunet-revocation.c:426
 msgid ""
 "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:438
+#: src/revocation/gnunet-revocation.c:456
 #, fuzzy
 msgid "No filename to store revocation certificate given.\n"
 msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n"
 
-#: src/revocation/gnunet-revocation.c:451
+#: src/revocation/gnunet-revocation.c:471
 #, fuzzy, c-format
 msgid "Failed to read revocation certificate from `%s'\n"
 msgstr "Se produjo un fallo al leer la lista de amigos de «%s»\n"
 
-#: src/revocation/gnunet-revocation.c:471
+#: src/revocation/gnunet-revocation.c:493
 #, fuzzy
 msgid "No action specified. Nothing to do.\n"
 msgstr "Ninguna interfaz especificada, usando la marcada por defecto\n"
 
-#: src/revocation/gnunet-revocation.c:490
+#: src/revocation/gnunet-revocation.c:512
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:498
+#: src/revocation/gnunet-revocation.c:520
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:505
+#: src/revocation/gnunet-revocation.c:527
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:512
+#: src/revocation/gnunet-revocation.c:534
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:458
+#: src/revocation/gnunet-revocation.c:540
+#, fuzzy
+msgid "number of epochs to calculate for"
+msgstr "número de pares para empezar"
+
+#: src/revocation/gnunet-service-revocation.c:454
 #, fuzzy
 msgid "# unsupported revocations received via set union"
 msgstr "Opciones de paquete IPv4 recibidas.  Ignoradas.\n"
 
-#: src/revocation/gnunet-service-revocation.c:468
+#: src/revocation/gnunet-service-revocation.c:464
 #, fuzzy
 msgid "# revocation messages received via set union"
 msgstr "# mensajes «DATA» recibidos vía WLAN"
 
-#: src/revocation/gnunet-service-revocation.c:474
+#: src/revocation/gnunet-service-revocation.c:470
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:478
+#: src/revocation/gnunet-service-revocation.c:474
 #, fuzzy
 msgid "# revocation set unions failed"
 msgstr "# sesiones wlan creadas"
 
-#: src/revocation/gnunet-service-revocation.c:490
+#: src/revocation/gnunet-service-revocation.c:486
 #, fuzzy
 msgid "# revocation set unions completed"
 msgstr "# transmisiones de fragmentos completadas"
 
-#: src/revocation/gnunet-service-revocation.c:530
+#: src/revocation/gnunet-service-revocation.c:526
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:871
+#: src/revocation/gnunet-service-revocation.c:881
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "No se pudo conectar con el almacén de datos."
 
+#: src/rps/gnunet-rps.c:270
+msgid "Seed a PeerID"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:275
+msgid "Get updates of view (0 for infinite updates)"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:279
+msgid "Get peers from biased stream"
+msgstr ""
+
 #: src/rps/gnunet-rps-profiler.c:3200
 #, fuzzy
 msgid "duration of the profiling"
@@ -6404,18 +6458,6 @@ msgstr "número de pares para empezar"
 msgid "Measure quality and performance of the RPS service."
 msgstr "Medir la calidad y rendimiento del servicio NSE."
 
-#: src/rps/gnunet-rps.c:270
-msgid "Seed a PeerID"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:275
-msgid "Get updates of view (0 for infinite updates)"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:279
-msgid "Get peers from biased stream"
-msgstr ""
-
 #: src/scalarproduct/gnunet-scalarproduct.c:229
 #, fuzzy
 msgid "You must specify at least one message ID to check!\n"
@@ -6471,10 +6513,10 @@ msgstr ""
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1127
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1073
 #: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1363
 #: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1366
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1127
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1073
 #, fuzzy
 msgid "Connect to CADET failed\n"
 msgstr "Conexión fallida (¿bug?)\n"
@@ -6571,93 +6613,93 @@ msgstr "Escritos %llu bytes de estadísticas a «%s»\n"
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Cargando %llu bytes de estadísticas de «%s»\n"
 
-#: src/statistics/gnunet-statistics.c:409
-#: src/statistics/gnunet-statistics.c:448
+#: src/statistics/gnunet-statistics.c:413
+#: src/statistics/gnunet-statistics.c:455
 msgid "Failed to obtain statistics.\n"
 msgstr "Se produjo un fallo al obtener las estadísticas.\n"
 
-#: src/statistics/gnunet-statistics.c:412
-#: src/statistics/gnunet-statistics.c:451
+#: src/statistics/gnunet-statistics.c:416
+#: src/statistics/gnunet-statistics.c:458
 #, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr ""
 "Se produjo un fallo al obtener las estadísticas de la máquina «%s:%llu»\n"
 
-#: src/statistics/gnunet-statistics.c:526
+#: src/statistics/gnunet-statistics.c:532
 msgid "Missing argument: subsystem \n"
 msgstr "Falta el parámetro: subsistema\n"
 
-#: src/statistics/gnunet-statistics.c:532
+#: src/statistics/gnunet-statistics.c:538
 msgid "Missing argument: name\n"
 msgstr "Falta el argumento: nombre\n"
 
-#: src/statistics/gnunet-statistics.c:571
+#: src/statistics/gnunet-statistics.c:577
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr "No se proporcionó un subsistema o un nombre\n"
 
-#: src/statistics/gnunet-statistics.c:583
+#: src/statistics/gnunet-statistics.c:589
 #, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Se produjo un fallo al inicializar la rutina de visualización\n"
 
-#: src/statistics/gnunet-statistics.c:710
+#: src/statistics/gnunet-statistics.c:725
 #, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Parámetro no válido «%s»\n"
 
-#: src/statistics/gnunet-statistics.c:726
+#: src/statistics/gnunet-statistics.c:742
 #, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "Se necesita un puerto para conectar con la máquina «%s»\n"
 
-#: src/statistics/gnunet-statistics.c:735
+#: src/statistics/gnunet-statistics.c:751
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr "Un puerto debe estar entre 1 y 65534 para conectar a la máquina «%s»\n"
 
-#: src/statistics/gnunet-statistics.c:764
+#: src/statistics/gnunet-statistics.c:783
 #, c-format
 msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:797
+#: src/statistics/gnunet-statistics.c:816
 msgid "limit output to statistics for the given NAME"
 msgstr "limita la salida de estadísticas para el nombre (NAME) dado"
 
-#: src/statistics/gnunet-statistics.c:803
+#: src/statistics/gnunet-statistics.c:821
 msgid "make the value being set persistent"
 msgstr "hacer el valor persistente"
 
-#: src/statistics/gnunet-statistics.c:810
+#: src/statistics/gnunet-statistics.c:827
 msgid "limit output to the given SUBSYSTEM"
 msgstr "límite de salida para el subsistema (SUBSYSTEM) dado"
 
-#: src/statistics/gnunet-statistics.c:816
+#: src/statistics/gnunet-statistics.c:832
 msgid "use as csv separator"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:823
+#: src/statistics/gnunet-statistics.c:838
 msgid "path to the folder containing the testbed data"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:829
+#: src/statistics/gnunet-statistics.c:843
 msgid "just print the statistics value"
 msgstr "imprime el valor de las estadísticas"
 
-#: src/statistics/gnunet-statistics.c:834
+#: src/statistics/gnunet-statistics.c:847
 msgid "watch value continuously"
 msgstr "visualiza el valor continuamente"
 
-#: src/statistics/gnunet-statistics.c:840
+#: src/statistics/gnunet-statistics.c:852
 msgid "connect to remote host"
 msgstr "conectar a equipo remoto"
 
-#: src/statistics/gnunet-statistics.c:846
+#: src/statistics/gnunet-statistics.c:857
 msgid "port for remote host"
 msgstr "puerto del equipo remoto"
 
-#: src/statistics/gnunet-statistics.c:861
+#: src/statistics/gnunet-statistics.c:874
 msgid "Print statistics about GNUnet operations."
 msgstr "Imprime estadísticas acerca de las operaciones de GNUnet."
 
@@ -6749,7 +6791,7 @@ msgid ""
 msgstr ""
 
 #: src/testbed/gnunet-daemon-testbed-underlay.c:234 src/testing/list-keys.c:47
-#: src/testing/testing.c:284 src/util/gnunet-ecc.c:292
+#: src/testing/testing.c:284 src/util/gnunet-ecc.c:318
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr "El fichero de máquinas no tiene el formato correcto: %s\n"
@@ -6823,6 +6865,16 @@ msgstr "Petición ignorada porque el ARM se está apagando.\n"
 msgid "%.s Unknown result code."
 msgstr "Código de respuesta del ARM desconocido.\n"
 
+#: src/testbed/gnunet_testbed_mpi_spawn.c:119
+#, fuzzy
+msgid "Waiting for child to exit.\n"
+msgstr "Esperando a los pares para conectar (%u ciclos restantes)...\n"
+
+#: src/testbed/gnunet_testbed_mpi_spawn.c:242
+#, fuzzy, c-format
+msgid "Spawning process `%s'\n"
+msgstr "Iniciando el proceso auxiliar (HELPER) «%s»\n"
+
 #: src/testbed/gnunet-testbed-profiler.c:290
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr "tolerar un número «COUNT» de continuas expiraciones de plazo"
@@ -6834,16 +6886,6 @@ msgid ""
 "signal is received"
 msgstr ""
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:119
-#, fuzzy
-msgid "Waiting for child to exit.\n"
-msgstr "Esperando a los pares para conectar (%u ciclos restantes)...\n"
-
-#: src/testbed/gnunet_testbed_mpi_spawn.c:242
-#, fuzzy, c-format
-msgid "Spawning process `%s'\n"
-msgstr "Iniciando el proceso auxiliar (HELPER) «%s»\n"
-
 #: src/testbed/testbed_api.c:399
 #, c-format
 msgid "Adding host %u failed with error: %s\n"
@@ -7164,93 +7206,93 @@ msgstr "# mensajes «HELLO» recibidos"
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:2227
-#: src/transport/gnunet-communicator-udp.c:2712
-#: src/transport/gnunet-service-tng.c:10024
-#: src/transport/gnunet-service-transport.c:2627
+#: src/transport/gnunet-communicator-tcp.c:2458
+#: src/transport/gnunet-communicator-udp.c:2825
+#: src/transport/gnunet-service-tng.c:10027
+#: src/transport/gnunet-service-transport.c:2624
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 "El servicio de transporte carece de opciones de configuración de clave.  "
 "Saliendo.\n"
 
-#: src/transport/gnunet-communicator-tcp.c:2285
+#: src/transport/gnunet-communicator-tcp.c:2754
 #, fuzzy
 msgid "GNUnet TCP communicator"
 msgstr "Configurador Gtk de GNUnet"
 
-#: src/transport/gnunet-communicator-udp.c:2784
+#: src/transport/gnunet-communicator-udp.c:2897
 #, fuzzy
 msgid "GNUnet UDP communicator"
 msgstr "Configurador Gtk de GNUnet"
 
-#: src/transport/gnunet-communicator-unix.c:782
+#: src/transport/gnunet-communicator-unix.c:788
 #, fuzzy
 msgid ""
 "Maximum number of UNIX connections exceeded, dropping incoming message\n"
 msgstr "El número máximo de conexiones es %u\n"
 
-#: src/transport/gnunet-communicator-unix.c:1009
+#: src/transport/gnunet-communicator-unix.c:1015
 #, fuzzy
 msgid "UNIX communicator is lacking key configuration settings. Exiting.\n"
 msgstr ""
 "El servicio NSE carece de opciones de configuración de clave.  Saliendo.\n"
 
-#: src/transport/gnunet-communicator-unix.c:1054
+#: src/transport/gnunet-communicator-unix.c:1060
 #: src/transport/plugin_transport_unix.c:1383
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/transport/gnunet-communicator-unix.c:1132
+#: src/transport/gnunet-communicator-unix.c:1138
 msgid "GNUnet UNIX domain socket communicator"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_ats.c:137
+msgid "# Addresses given to ATS"
+msgstr ""
+
 #: src/transport/gnunet-service-transport.c:445
 msgid "# messages dropped due to slow client"
 msgstr "# mensajes omitidos debido a un cliente lento"
 
-#: src/transport/gnunet-service-transport.c:791
+#: src/transport/gnunet-service-transport.c:794
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr "# bytes de «payload» omitidos (el otro par no estaba conectado)"
 
-#: src/transport/gnunet-service-transport.c:1474
+#: src/transport/gnunet-service-transport.c:1477
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer"
 msgstr "# bytes de «payload» descartados debido a par no conectado"
 
-#: src/transport/gnunet-service-transport.c:1619
+#: src/transport/gnunet-service-transport.c:1622
 msgid "# bytes total received"
 msgstr "# total de bytes recibidos"
 
-#: src/transport/gnunet-service-transport.c:1709
+#: src/transport/gnunet-service-transport.c:1712
 msgid "# bytes payload received"
 msgstr "# bytes de «payload» recibidos"
 
-#: src/transport/gnunet-service-transport.c:2013
-#: src/transport/gnunet-service-transport.c:2452
+#: src/transport/gnunet-service-transport.c:2016
+#: src/transport/gnunet-service-transport.c:2450
 msgid "# disconnects due to blacklist"
 msgstr "# desconexiones debido a la lista negra"
 
-#: src/transport/gnunet-service-transport.c:2456
+#: src/transport/gnunet-service-transport.c:2454
 #, fuzzy, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "Se produjo un fallo al cargar el módulo del transporte para «%s»\n"
 
-#: src/transport/gnunet-service-transport.c:2551
+#: src/transport/gnunet-service-transport.c:2549
 #, fuzzy, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr "Añadiendo «%s» sin direcciones para el par «%s»\n"
 
-#: src/transport/gnunet-service-transport.c:2560
+#: src/transport/gnunet-service-transport.c:2558
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_ats.c:137
-msgid "# Addresses given to ATS"
-msgstr ""
-
 #: src/transport/gnunet-service-transport_hello.c:195
 msgid "# refreshed my HELLO"
 msgstr "# refrescos de mi «HELLO»"
@@ -7500,7 +7542,7 @@ msgstr "# revalidaciones de direcciones iniciadas"
 #: src/transport/gnunet-service-transport_validation.c:489
 #: src/transport/gnunet-service-transport_validation.c:679
 #: src/transport/gnunet-service-transport_validation.c:1000
-#: src/transport/gnunet-service-transport_validation.c:1626
+#: src/transport/gnunet-service-transport_validation.c:1627
 #, fuzzy
 msgid "# validations running"
 msgstr "Base de datos sqlite ejecutándose\n"
@@ -7561,76 +7603,37 @@ msgstr ""
 "No confirmando el PING con dirección «%s» ya que no puedo confirmar tener "
 "esa dirección.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1278
+#: src/transport/gnunet-service-transport_validation.c:1279
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "Se produjo un fallo al crear la página para «%s»\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1330
+#: src/transport/gnunet-service-transport_validation.c:1331
 msgid "# PONGs unicast via reliable transport"
 msgstr "# unicast de PONG vía transporte confiable"
 
-#: src/transport/gnunet-service-transport_validation.c:1339
+#: src/transport/gnunet-service-transport_validation.c:1340
 msgid "# PONGs multicast to all available addresses"
 msgstr "# multicast de PONG a todas las direcciones disponibles"
 
-#: src/transport/gnunet-service-transport_validation.c:1514
+#: src/transport/gnunet-service-transport_validation.c:1515
 msgid "# PONGs dropped, no matching pending validation"
 msgstr "# PONG omitidos, no hay una validación pendiente coincidente"
 
-#: src/transport/gnunet-service-transport_validation.c:1532
+#: src/transport/gnunet-service-transport_validation.c:1533
 msgid "# PONGs dropped, signature expired"
 msgstr "# Mensajes PONG omitidos, firma expirada"
 
-#: src/transport/gnunet-service-transport_validation.c:1589
+#: src/transport/gnunet-service-transport_validation.c:1590
 #, fuzzy
 msgid "# validations succeeded"
 msgstr "# revalidaciones de direcciones iniciadas"
 
-#: src/transport/gnunet-service-transport_validation.c:1644
+#: src/transport/gnunet-service-transport_validation.c:1645
 #, fuzzy
 msgid "# HELLOs given to peerinfo"
 msgstr "# «HELLO» obtenidos de «peerinfo»"
 
-#: src/transport/gnunet-transport-profiler.c:220
-#, c-format
-msgid "%llu B in %llu ms == %.2f KB/s!\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:577
-msgid "send data to peer"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:581
-#, fuzzy
-msgid "receive data from peer"
-msgstr "# respuestas recibidas de otros pares"
-
-#: src/transport/gnunet-transport-profiler.c:586
-#, fuzzy
-msgid "iterations"
-msgstr "Otras configuraciones"
-
-#: src/transport/gnunet-transport-profiler.c:591
-#, fuzzy
-msgid "number of messages to send"
-msgstr "número de mensajes a usar por iteración"
-
-#: src/transport/gnunet-transport-profiler.c:596
-#, fuzzy
-msgid "message size to use"
-msgstr "tamaño del mensaje"
-
-#: src/transport/gnunet-transport-profiler.c:601
-#: src/transport/gnunet-transport.c:1404
-msgid "peer identity"
-msgstr "identidad del par"
-
-#: src/transport/gnunet-transport-profiler.c:614
-#: src/transport/gnunet-transport.c:1426
-msgid "Direct access to transport service."
-msgstr "Acceso directo al servicio de transporte."
-
 #: src/transport/gnunet-transport.c:406
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
@@ -7775,6 +7778,11 @@ msgstr ""
 msgid "do not resolve hostnames"
 msgstr "no resolver nombres de máquinas"
 
+#: src/transport/gnunet-transport.c:1404
+#: src/transport/gnunet-transport-profiler.c:601
+msgid "peer identity"
+msgstr "identidad del par"
+
 #: src/transport/gnunet-transport.c:1408
 #, fuzzy
 msgid "monitor plugin sessions"
@@ -7784,6 +7792,40 @@ msgstr "# sesiones wlan pendientes"
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr "enviar data para prueba a otro par (hasta CTRL-C)"
 
+#: src/transport/gnunet-transport.c:1426
+#: src/transport/gnunet-transport-profiler.c:614
+msgid "Direct access to transport service."
+msgstr "Acceso directo al servicio de transporte."
+
+#: src/transport/gnunet-transport-profiler.c:220
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:577
+msgid "send data to peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:581
+#, fuzzy
+msgid "receive data from peer"
+msgstr "# respuestas recibidas de otros pares"
+
+#: src/transport/gnunet-transport-profiler.c:586
+#, fuzzy
+msgid "iterations"
+msgstr "Otras configuraciones"
+
+#: src/transport/gnunet-transport-profiler.c:591
+#, fuzzy
+msgid "number of messages to send"
+msgstr "número de mensajes a usar por iteración"
+
+#: src/transport/gnunet-transport-profiler.c:596
+#, fuzzy
+msgid "message size to use"
+msgstr "tamaño del mensaje"
+
 #: src/transport/plugin_transport_http_client.c:1489
 #: src/transport/plugin_transport_http_server.c:2331
 #: src/transport/plugin_transport_http_server.c:3562
@@ -8068,6 +8110,23 @@ msgstr "Transporte TCP no escuchando en ningún puerto (únicamente cliente)\n"
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr "El transporte TCP anuncia que está en el puerto %llu\n"
 
+#: src/transport/plugin_transport_udp_broadcasting.c:169
+#, fuzzy
+msgid "# Multicast HELLO beacons received via UDP"
+msgstr "# beacons HELLO multicast IPv6 recibidos vía UDP"
+
+#: src/transport/plugin_transport_udp_broadcasting.c:553
+msgid ""
+"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:571
+#, c-format
+msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
+msgstr ""
+"Se produjo un fallo al establecer la opción de «broadcast» IPv4 para el "
+"«socket» en el puerto %d\n"
+
 #: src/transport/plugin_transport_udp.c:3169
 #, c-format
 msgid ""
@@ -8122,23 +8181,6 @@ msgstr "«%s» no es una dirección IP válida.\n"
 msgid "Failed to create UDP network sockets\n"
 msgstr "Se produjo un fallo al crear una nueva firma"
 
-#: src/transport/plugin_transport_udp_broadcasting.c:169
-#, fuzzy
-msgid "# Multicast HELLO beacons received via UDP"
-msgstr "# beacons HELLO multicast IPv6 recibidos vía UDP"
-
-#: src/transport/plugin_transport_udp_broadcasting.c:553
-msgid ""
-"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp_broadcasting.c:571
-#, c-format
-msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
-msgstr ""
-"Se produjo un fallo al establecer la opción de «broadcast» IPv4 para el "
-"«socket» en el puerto %d\n"
-
 #: src/transport/plugin_transport_unix.c:1396
 #, fuzzy, c-format
 msgid "Cannot bind to `%s'\n"
@@ -8229,17 +8271,17 @@ msgstr "Acceso denegado a «%s»\n"
 msgid "Accepting connection from `%s': %p\n"
 msgstr "Aceptando conexión desde «%s»: %p\n"
 
-#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1400
+#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1396
 #, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "«%s» falló para el puerto %d (%s).\n"
 
-#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1412
+#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1408
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "«%s» falló para el puerto %d (%s): dirección en uso actualmente\n"
 
-#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1419
+#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1415
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "«%s» falló para «%.*s»: dirección en uso actualmente\n"
@@ -8253,7 +8295,7 @@ msgstr ""
 "El código de procesado para el mensaje del tipo %u no llamó a "
 "«GNUNET_SERVER_receive_done» después de %s\n"
 
-#: src/transport/tcp_service_legacy.c:345 src/util/service.c:837
+#: src/transport/tcp_service_legacy.c:345 src/util/service.c:833
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr "Familia de direcciones %d desconocida\n"
@@ -8263,23 +8305,23 @@ msgstr "Familia de direcciones %d desconocida\n"
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr "Acceso denegado desde «%s» al servicio «%s»\n"
 
-#: src/transport/tcp_service_legacy.c:410 src/util/service.c:950
+#: src/transport/tcp_service_legacy.c:410 src/util/service.c:946
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr "No se pudo procesar la especificación de red IPv4 «%s» para «%s:%s»\n"
 
-#: src/transport/tcp_service_legacy.c:451 src/util/service.c:991
+#: src/transport/tcp_service_legacy.c:451 src/util/service.c:987
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr "No se pudo procesar la especificación de red IPv6 «%s» para «%s:%s»\n"
 
 #: src/transport/tcp_service_legacy.c:890
-#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1480
+#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1476
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr "El valor especificado «%s» para el servicio «%s» no es válido\n"
 
-#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1504
+#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1500
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -8296,46 +8338,46 @@ msgstr "Se produjo un fallo al inciar «%s» en «%s»\n"
 msgid "Service `%s' runs at %s\n"
 msgstr "El servicio «%s» se ejecuta en %s\n"
 
-#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1750
+#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1746
 msgid "Service process failed to initialize\n"
 msgstr "No se pudo inicializar el proceso del servicio\n"
 
-#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1755
+#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1751
 msgid "Service process could not initialize server function\n"
 msgstr ""
 "No se pudo inicializar la función del servidor en el proceso del servicio\n"
 
-#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1760
+#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1756
 msgid "Service process failed to report status\n"
 msgstr "El proceso del servicio no devolvió un estado\n"
 
-#: src/transport/tcp_service_legacy.c:1253 src/util/disk.c:1177
-#: src/util/service.c:1641
+#: src/transport/tcp_service_legacy.c:1253 src/util/disk.c:1176
+#: src/util/service.c:1637
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "No se pudo obtener información acerca del usuario «%s»: %s\n"
 
-#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1643
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1639
 msgid "No such user"
 msgstr "No existe tal usuario"
 
-#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1657
+#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1653
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Imposible cambiar el usuario/grupo a «%s»: %s\n"
 
-#: src/transport/tcp_service_legacy.c:1348 src/util/service.c:1999
+#: src/transport/tcp_service_legacy.c:1348 src/util/service.c:1996
 msgid "do daemonize (detach from terminal)"
 msgstr "demonizar (desasociar del terminal)"
 
 #: src/transport/tcp_service_legacy.c:1397
-#: src/transport/transport-testing2.c:906 src/util/service.c:2073
-#: src/util/service.c:2085
+#: src/transport/transport-testing2.c:1061 src/util/service.c:2072
+#: src/util/service.c:2084
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 
-#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2095
+#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2094
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
@@ -8345,100 +8387,150 @@ msgstr "Se produjo un fallo al borrar el fichero de configuración %s\n"
 msgid "Could not access configuration file `%s'\n"
 msgstr "No se pudo acceder al fichero de configuración «%s»\n"
 
-#: src/transport/transport_api2_communication.c:704
+#: src/transport/transport_api2_communication.c:743
 msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/util/bio.c:177 src/util/bio.c:185
-#, c-format
-msgid "Error reading `%s': %s"
+#: src/util/bio.c:227 src/util/bio.c:235
+#, fuzzy, c-format
+msgid "Error reading `%s' from file: %s"
 msgstr "Error leyendo «%s»: %s"
 
-#: src/util/bio.c:187
+#: src/util/bio.c:237
 msgid "End of file"
 msgstr "Fin del fichero"
 
-#: src/util/bio.c:244
+#: src/util/bio.c:266
+#, fuzzy, c-format
+msgid "Error while reading `%s' from buffer: %s"
+msgstr "Error decodificando clave %u\n"
+
+#: src/util/bio.c:268
+msgid "Not enough data left"
+msgstr ""
+
+#: src/util/bio.c:308
+#, fuzzy, c-format
+msgid "Invalid handle type while reading `%s'"
+msgstr "Parámetro no válido «%s» en la línea de comandos\n"
+
+#: src/util/bio.c:335 src/util/bio.c:838
+msgid "string length"
+msgstr ""
+
+#: src/util/bio.c:341
+#, fuzzy, c-format
+msgid "%s (while reading `%s')"
+msgstr "Error decodificando clave %u\n"
+
+#: src/util/bio.c:346
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr "Se produjo un error leyendo la cadena «%s»"
 
-#: src/util/bio.c:255
+#: src/util/bio.c:359
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr "La cadena «%s» es mayor de lo permitido (%u > %u)"
 
-#: src/util/bio.c:303
-#, c-format
-msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
+#: src/util/bio.c:398 src/util/bio.c:863 src/util/bio.c:880
+msgid "metadata length"
+msgstr ""
+
+#: src/util/bio.c:410
+#, fuzzy, c-format
+msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
 msgstr "Los metadatos serializados «%s» son mayores de lo permitido (%u>%u)"
 
-#: src/util/bio.c:319
-#, c-format
-msgid "Metadata `%s' failed to deserialize"
-msgstr "Se produjo un fallo al deserializar los metadatos «%s»"
+#: src/util/bio.c:426
+#, fuzzy, c-format
+msgid "Failed to deserialize metadata `%s'"
+msgstr "Se produjo un fallo al serializar metadatos"
+
+#: src/util/bio.c:667
+msgid "Unable to flush buffer to file"
+msgstr ""
 
-#: src/util/client.c:739 src/util/client.c:931
+#: src/util/bio.c:729 src/util/bio.c:750
+#, fuzzy, c-format
+msgid "Error while writing `%s' to file: %s"
+msgstr "Error decodificando clave %u\n"
+
+#: src/util/bio.c:731
+msgid "No associated file"
+msgstr ""
+
+#: src/util/bio.c:815
+#, fuzzy, c-format
+msgid "Invalid handle type while writing `%s'"
+msgstr "Formato de tiempo no válido «%s»\n"
+
+#: src/util/bio.c:875
+#, fuzzy, c-format
+msgid "Failed to serialize metadata `%s'"
+msgstr "Se produjo un fallo al serializar metadatos"
+
+#: src/util/client.c:747 src/util/client.c:937
 msgid "not a valid filename"
 msgstr ""
 
-#: src/util/client.c:1097
+#: src/util/client.c:1103
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr "Se necesita un nombre de máquina no vacío para el servicio «%s».\n"
 
-#: src/util/common_logging.c:259 src/util/common_logging.c:1116
+#: src/util/common_logging.c:259 src/util/common_logging.c:1114
 msgid "DEBUG"
 msgstr "DEPURACIÓN"
 
-#: src/util/common_logging.c:261 src/util/common_logging.c:1114
+#: src/util/common_logging.c:261 src/util/common_logging.c:1112
 msgid "INFO"
 msgstr "INFORMACIÓN"
 
-#: src/util/common_logging.c:263 src/util/common_logging.c:1112
+#: src/util/common_logging.c:263 src/util/common_logging.c:1110
 msgid "MESSAGE"
 msgstr "MENSAJE"
 
-#: src/util/common_logging.c:265 src/util/common_logging.c:1110
+#: src/util/common_logging.c:265 src/util/common_logging.c:1108
 msgid "WARNING"
 msgstr "PELIGRO"
 
-#: src/util/common_logging.c:267 src/util/common_logging.c:1108
+#: src/util/common_logging.c:267 src/util/common_logging.c:1106
 msgid "ERROR"
 msgstr "ERROR"
 
-#: src/util/common_logging.c:269 src/util/common_logging.c:1118
+#: src/util/common_logging.c:269 src/util/common_logging.c:1116
 msgid "NONE"
 msgstr "NINGUNO"
 
-#: src/util/common_logging.c:630 src/util/common_logging.c:669
+#: src/util/common_logging.c:626 src/util/common_logging.c:665
 #, c-format
 msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:906
+#: src/util/common_logging.c:904
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "Mensaje `%.*s» repetido %u veces en el último %s\n"
 
-#: src/util/common_logging.c:1119
+#: src/util/common_logging.c:1117
 msgid "INVALID"
 msgstr "NO V�LIDO"
 
-#: src/util/common_logging.c:1400
+#: src/util/common_logging.c:1398
 msgid "unknown address"
 msgstr "dirección desconocida"
 
-#: src/util/common_logging.c:1445
+#: src/util/common_logging.c:1443
 msgid "invalid address"
 msgstr "dirección no válida"
 
-#: src/util/common_logging.c:1464
+#: src/util/common_logging.c:1462
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "¡La configuración no especifica la opción «%s» en la sección «%s»!\n"
 
-#: src/util/common_logging.c:1487
+#: src/util/common_logging.c:1485
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8446,22 +8538,22 @@ msgstr ""
 "La configuración especifica un valor no válido en la opción «%s» de la "
 "sección «%s»: %s\n"
 
-#: src/util/configuration.c:325
+#: src/util/configuration.c:402
 #, c-format
 msgid "Syntax error while deserializing in line %u\n"
 msgstr "Error de sintaxis en la línea %u mientras se deserializaba\n"
 
-#: src/util/configuration.c:383
+#: src/util/configuration.c:460
 #, fuzzy, c-format
 msgid "Error while reading file `%s'\n"
 msgstr "Error decodificando clave %u\n"
 
-#: src/util/configuration.c:986
+#: src/util/configuration.c:1063
 #, fuzzy
 msgid "Not a valid relative time specification"
 msgstr "Tiempo de expiración no válido para la operación «%s»\n"
 
-#: src/util/configuration.c:1077
+#: src/util/configuration.c:1154
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
@@ -8470,17 +8562,17 @@ msgstr ""
 "El valor de configuración «%s» para «%s» de la sección «%s» no está dentro "
 "de las opciones legales\n"
 
-#: src/util/configuration.c:1192
+#: src/util/configuration.c:1269
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1224
+#: src/util/configuration.c:1301
 #, fuzzy, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr "Falta la opción «%s» para la operación «%s»\n"
 
-#: src/util/configuration.c:1290
+#: src/util/configuration.c:1367
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -8496,47 +8588,17 @@ msgstr ""
 "El tamaño del fichero en disco es incorrecto para este «Bloom "
 "filter» (esperado %llu, tiene %llu)\n"
 
-#: src/util/crypto_ecc.c:705
+#: src/util/crypto_ecc.c:663
 #, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "El firmado ECC falló en %s:%d: %s\n"
 
-#: src/util/crypto_ecc.c:822
+#: src/util/crypto_ecc.c:791
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n"
 
-#: src/util/crypto_ecc_setup.c:136 src/util/crypto_ecc_setup.c:178
-#: src/util/crypto_ecc_setup.c:318 src/util/crypto_ecc_setup.c:360
-#, c-format
-msgid "Could not acquire lock on file `%s': %s...\n"
-msgstr "No se pudo bloquear el fichero «%s»: %s...\n"
-
-#: src/util/crypto_ecc_setup.c:142 src/util/crypto_ecc_setup.c:324
-msgid "Creating a new private key.  This may take a while.\n"
-msgstr "Generando una clave privada nueva.  Esto puede tomar un tiempo.\n"
-
-#: src/util/crypto_ecc_setup.c:184 src/util/crypto_ecc_setup.c:366
-msgid "This may be ok if someone is currently generating a private key.\n"
-msgstr ""
-"Esto puede estar bien si alguien está actualmente generando una clave "
-"privada.\n"
-
-#: src/util/crypto_ecc_setup.c:220 src/util/crypto_ecc_setup.c:402
-#, c-format
-msgid ""
-"When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
-msgstr ""
-"Cuando se intentaba leer el fichero de claves «%s» se encontraron %u bytes "
-"pero al menos %u son necesarios.\n"
-
-#: src/util/crypto_ecc_setup.c:225 src/util/crypto_ecc_setup.c:407
-msgid "This may be ok if someone is currently generating a key.\n"
-msgstr ""
-"Esto puede ser correcto si alguien está actualmente generando una clave de "
-"máquina.\n"
-
-#: src/util/crypto_ecc_setup.c:469
+#: src/util/crypto_ecc_setup.c:369
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "No se pudo acceder a la clave de máquina.\n"
@@ -8546,17 +8608,17 @@ msgstr "No se pudo acceder a la clave de máquina.\n"
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt no tiene la versión esperada (se necesita la versión %s).\n"
 
-#: src/util/crypto_rsa.c:956
+#: src/util/crypto_rsa.c:959
 #, fuzzy, c-format
 msgid "RSA signing failed at %s:%d: %s\n"
 msgstr "El firmado ECC falló en %s:%d: %s\n"
 
-#: src/util/crypto_rsa.c:1313
+#: src/util/crypto_rsa.c:1318
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "La verificación de la firma RSA fallo en %s:%d: %s\n"
 
-#: src/util/disk.c:941
+#: src/util/disk.c:940
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "¡Se esperaba que «%s» fuera un directorio!\n"
@@ -8658,11 +8720,11 @@ msgstr "La opción «%s» no tiene sentido sin la opción «%s».\n"
 msgid "Missing mandatory option `%s'.\n"
 msgstr "Falta la opción «%s» para la operación «%s»\n"
 
-#: src/util/getopt_helpers.c:68
+#: src/util/getopt_helpers.c:69
 msgid "print the version number"
 msgstr "imprime el número de versión"
 
-#: src/util/getopt_helpers.c:114
+#: src/util/getopt_helpers.c:116
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
@@ -8670,54 +8732,73 @@ msgstr ""
 "Los parámetros obligatorios para las opciones largas también lo son para sus "
 "versiones cortas.\n"
 
-#: src/util/getopt_helpers.c:205
+#: src/util/getopt_helpers.c:208
 msgid "print this help"
 msgstr "imprime esta ayuda"
 
-#: src/util/getopt_helpers.c:281
+#: src/util/getopt_helpers.c:288
 msgid "be verbose"
 msgstr ""
 
-#: src/util/getopt_helpers.c:417
+#: src/util/getopt_helpers.c:429
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/util/getopt_helpers.c:495
+#: src/util/getopt_helpers.c:510
 msgid "configure logging to write logs to FILENAME"
 msgstr ""
 
-#: src/util/getopt_helpers.c:516
+#: src/util/getopt_helpers.c:532
 #, fuzzy
 msgid "use configuration file FILENAME"
 msgstr "crear ficheros de configuración únicos"
 
-#: src/util/getopt_helpers.c:551 src/util/getopt_helpers.c:747
-#: src/util/getopt_helpers.c:810
+#: src/util/getopt_helpers.c:568 src/util/getopt_helpers.c:859
+#: src/util/getopt_helpers.c:924
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Tienes que introducir un número en la opción «%s».\n"
 
-#: src/util/getopt_helpers.c:612
+#: src/util/getopt_helpers.c:649
+#, fuzzy, c-format
+msgid ""
+"You must pass a relative time (optionally with sign) to the `%s' option.\n"
+msgstr "Debes introducir un tiempo relativo en la opción «%s».\n"
+
+#: src/util/getopt_helpers.c:656
+#, c-format
+msgid "Value given for time travel `%s' option is too big.\n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:683
+msgid "[+/-]MICROSECONDS"
+msgstr ""
+
+#: src/util/getopt_helpers.c:685
+msgid "modify system time by given offset (for debugging/testing only)"
+msgstr ""
+
+#: src/util/getopt_helpers.c:720
 #, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "Debes introducir un tiempo relativo en la opción «%s».\n"
 
-#: src/util/getopt_helpers.c:675
+#: src/util/getopt_helpers.c:785
 #, fuzzy, c-format
 msgid "You must pass absolute time to the `%s' option.\n"
 msgstr "Debes introducir un tiempo relativo en la opción «%s».\n"
 
-#: src/util/getopt_helpers.c:740
+#: src/util/getopt_helpers.c:852
 #, c-format
-msgid "Your input for the '%s' option has to be a non negative number \n"
+msgid "Your input for the '%s' option has to be a non negative number\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:817
+#: src/util/getopt_helpers.c:931
 #, fuzzy, c-format
 msgid "You must pass a number below %u to the `%s' option.\n"
 msgstr "Tienes que introducir un número en la opción «%s».\n"
 
-#: src/util/getopt_helpers.c:902
+#: src/util/getopt_helpers.c:1018
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
@@ -8792,7 +8873,7 @@ msgstr "Generando %u claves, por favor, espere"
 msgid "Generating %u keys, please wait"
 msgstr "Generando %u claves, por favor, espere"
 
-#: src/util/gnunet-ecc.c:175
+#: src/util/gnunet-ecc.c:177
 #, c-format
 msgid ""
 "\n"
@@ -8815,56 +8896,56 @@ msgid ""
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:277
+#: src/util/gnunet-ecc.c:303
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr "El fichero de máquinas %s no fue encontrado\n"
 
-#: src/util/gnunet-ecc.c:287
+#: src/util/gnunet-ecc.c:313
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr "El archivo de amigos «%s» está vacío.\n"
 
-#: src/util/gnunet-ecc.c:307
+#: src/util/gnunet-ecc.c:333
 #, fuzzy, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr "¡No se puede leer el fichero de claves de máquina!\n"
 
-#: src/util/gnunet-ecc.c:361
+#: src/util/gnunet-ecc.c:387
 msgid "No hostkey file specified on command line\n"
 msgstr "No se ha especificado la clave de máquina en la línea de comandos\n"
 
-#: src/util/gnunet-ecc.c:425
+#: src/util/gnunet-ecc.c:451
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:431
+#: src/util/gnunet-ecc.c:457
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:437
+#: src/util/gnunet-ecc.c:463
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr "crea «COUNT» pares de claves pública-privada (para pruebas)"
 
-#: src/util/gnunet-ecc.c:442
+#: src/util/gnunet-ecc.c:468
 msgid "print the public key in ASCII format"
 msgstr "imprime la clave pública en formato ASCII"
 
-#: src/util/gnunet-ecc.c:447
+#: src/util/gnunet-ecc.c:473
 #, fuzzy
 msgid "print the private key in ASCII format"
 msgstr "imprime la clave pública en formato ASCII"
 
-#: src/util/gnunet-ecc.c:452
+#: src/util/gnunet-ecc.c:478
 #, fuzzy
 msgid "print the public key in HEX format"
 msgstr "imprime la clave pública en formato ASCII"
 
-#: src/util/gnunet-ecc.c:458
+#: src/util/gnunet-ecc.c:484
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:472
+#: src/util/gnunet-ecc.c:498
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "Manipular los ficheros de clave privada ECC de GNUnet"
 
@@ -8899,32 +8980,32 @@ msgstr ""
 msgid "perform a reverse lookup"
 msgstr "realizar una búsqueda inversa"
 
-#: src/util/gnunet-resolver.c:179
+#: src/util/gnunet-resolver.c:182
 msgid "Use build-in GNUnet stub resolver"
 msgstr "Utilizar el resolvedor interno para pruebas de GNUnet"
 
-#: src/util/gnunet-scrypt.c:219
+#: src/util/gnunet-scrypt.c:222
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "La carga de la clave de la máquina desde «%s» ha fallado.\n"
 
-#: src/util/gnunet-scrypt.c:285
+#: src/util/gnunet-scrypt.c:288
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:291
+#: src/util/gnunet-scrypt.c:294
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:297
+#: src/util/gnunet-scrypt.c:300
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:303
+#: src/util/gnunet-scrypt.c:306
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:316
+#: src/util/gnunet-scrypt.c:319
 #, fuzzy
 msgid "Manipulate GNUnet proof of work files"
 msgstr "Manipular los ficheros de clave privada ECC de GNUnet"
@@ -8972,7 +9053,7 @@ msgstr ""
 "¡Error lógico interno fatal, el proceso está colgado en «%s» (abortar con "
 "CTRL-C)!\n"
 
-#: src/util/os_installation.c:408
+#: src/util/os_installation.c:409
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
@@ -8981,12 +9062,12 @@ msgstr ""
 "No se pudo determinar la ruta de instalación de %s.  Establezca la variable "
 "de entorno «%s».\n"
 
-#: src/util/os_installation.c:791
+#: src/util/os_installation.c:792
 #, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "¡No se pudo encontrar el programa llamado «%s» en PATH!\n"
 
-#: src/util/os_installation.c:824
+#: src/util/os_installation.c:825
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
@@ -9070,7 +9151,7 @@ msgid "Could not resolve our FQDN: %s\n"
 msgstr ""
 "No se pudo resolver nuestro nombre de dominio cualificado (FQDN) : %s\n"
 
-#: src/util/service.c:657
+#: src/util/service.c:653
 #, fuzzy, c-format
 msgid ""
 "Processing code for message of type %u did not call "
@@ -9079,7 +9160,7 @@ msgstr ""
 "El código de procesado para el mensaje del tipo %u no llamó a "
 "«GNUNET_SERVER_receive_done» después de %s\n"
 
-#: src/util/service.c:1572
+#: src/util/service.c:1568
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
@@ -9094,122 +9175,122 @@ msgstr ""
 msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
 
-#: src/util/strings.c:177
+#: src/util/strings.c:178
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:498
+#: src/util/strings.c:502
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr "Los conjuntos de caracteres pedidos fueron «%s»->«%s»\n"
 
-#: src/util/strings.c:622
+#: src/util/strings.c:636
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 "Se produjo un fallo al expandir «$HOME»: variable de entorno «HOME» no "
 "establecida"
 
-#: src/util/strings.c:691
+#: src/util/strings.c:705
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:695
+#: src/util/strings.c:709
 msgid "forever"
 msgstr "para siempre"
 
-#: src/util/strings.c:697
+#: src/util/strings.c:711
 msgid "0 ms"
 msgstr "0 ms"
 
-#: src/util/strings.c:701
+#: src/util/strings.c:715
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:705
+#: src/util/strings.c:719
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:709
+#: src/util/strings.c:723
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:713
+#: src/util/strings.c:727
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:719
+#: src/util/strings.c:733
 msgid "day"
 msgstr "día"
 
-#: src/util/strings.c:721
+#: src/util/strings.c:735
 msgid "days"
 msgstr "días"
 
-#: src/util/strings.c:749
+#: src/util/strings.c:763
 msgid "end of time"
 msgstr "fin del plazo"
 
-#: src/util/strings.c:1219
+#: src/util/strings.c:1239
 msgid "IPv6 address did not start with `['\n"
 msgstr "La dirección IPv6 no empezaba con «[»\n"
 
-#: src/util/strings.c:1227
+#: src/util/strings.c:1247
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr "La dirección IPv6 contenía «:» para separar el número de puerto\n"
 
-#: src/util/strings.c:1234
+#: src/util/strings.c:1254
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 "La dirección IPv6 contenía «]» antes de «:» para separar el número de "
 "puerto\n"
 
-#: src/util/strings.c:1242
+#: src/util/strings.c:1262
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 "La dirección IPv6 contenía un número de puerto válido después del último "
 "«:»\n"
 
-#: src/util/strings.c:1251
+#: src/util/strings.c:1271
 #, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Dirección IPv6 «%s» no válida: %s\n"
 
-#: src/util/strings.c:1479 src/util/strings.c:1490
+#: src/util/strings.c:1498 src/util/strings.c:1509
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1499
+#: src/util/strings.c:1518
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Se produjo un fallo al iniciar el servicio «%s»\n"
 
-#: src/util/strings.c:1582 src/util/strings.c:1611 src/util/strings.c:1658
-#: src/util/strings.c:1678
+#: src/util/strings.c:1601 src/util/strings.c:1630 src/util/strings.c:1677
+#: src/util/strings.c:1697
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Formato no válido para la IP: «%s»\n"
 
-#: src/util/strings.c:1636
+#: src/util/strings.c:1655
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Notación de red no válida («/%d» no es válido en IPv4 CIDR)."
 
-#: src/util/strings.c:1687
+#: src/util/strings.c:1706
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Formato de tiempo no válido «%s»\n"
 
-#: src/util/strings.c:1740
+#: src/util/strings.c:1759
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Notación de red no válida (no termina con «;»: «%s»)\n"
 
-#: src/util/strings.c:1790
+#: src/util/strings.c:1809
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Formato «%s» erroneo para máscara de red\n"
 
-#: src/util/strings.c:1821
+#: src/util/strings.c:1840
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Formato «%s» erroneo para red\n"
@@ -9403,11 +9484,40 @@ msgstr "el servicio es ofrecido vía UDP"
 msgid "Setup tunnels via VPN."
 msgstr "Configurar túneles vía VPN."
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:420
 #: src/zonemaster/gnunet-service-zonemaster.c:849
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:420
 msgid "Failed to connect to the namestore!\n"
 msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 
+#, c-format
+#~ msgid "Metadata `%s' failed to deserialize"
+#~ msgstr "Se produjo un fallo al deserializar los metadatos «%s»"
+
+#, c-format
+#~ msgid "Could not acquire lock on file `%s': %s...\n"
+#~ msgstr "No se pudo bloquear el fichero «%s»: %s...\n"
+
+#~ msgid "Creating a new private key.  This may take a while.\n"
+#~ msgstr "Generando una clave privada nueva.  Esto puede tomar un tiempo.\n"
+
+#~ msgid "This may be ok if someone is currently generating a private key.\n"
+#~ msgstr ""
+#~ "Esto puede estar bien si alguien está actualmente generando una clave "
+#~ "privada.\n"
+
+#, c-format
+#~ msgid ""
+#~ "When trying to read key file `%s' I found %u bytes but I need at least "
+#~ "%u.\n"
+#~ msgstr ""
+#~ "Cuando se intentaba leer el fichero de claves «%s» se encontraron %u "
+#~ "bytes pero al menos %u son necesarios.\n"
+
+#~ msgid "This may be ok if someone is currently generating a key.\n"
+#~ msgstr ""
+#~ "Esto puede ser correcto si alguien está actualmente generando una clave "
+#~ "de máquina.\n"
+
 #, fuzzy
 #~ msgid "No default ego configured in identity service\n"
 #~ msgstr "'%s': servicio desconocido: %s\n"
@@ -11362,9 +11472,6 @@ msgstr "¡Se produjo un fallo al conectar con el almacén de nombres!\n"
 #~ msgid "Unknown error"
 #~ msgstr "Error desconocido"
 
-#~ msgid "Failed to serialize meta data"
-#~ msgstr "Se produjo un fallo al serializar metadatos"
-
 #~ msgid "Failed to parse URI `%s' from KBlock!\n"
 #~ msgstr "¡Se produjo un fallo al procesar la URI «%s» del KBlock!\n"
 
diff --git a/po/fr.po b/po/fr.po
index d6a932d36..79a26dc73 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2020-01-13 14:01+0000\n"
+"POT-Creation-Date: 2020-07-07 12:22+0200\n"
 "PO-Revision-Date: 2015-12-24 01:20+0100\n"
 "Last-Translator: Stéphane  Aulery <lkppo@free.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -16,127 +16,127 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/abd/gnunet-abd.c:397 src/namestore/gnunet-namestore.c:1271
+#: src/abd/gnunet-abd.c:397 src/namestore/gnunet-namestore.c:1302
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:413 src/abd/gnunet-abd.c:886
+#: src/abd/gnunet-abd.c:413 src/abd/gnunet-abd.c:896
 #, c-format
 msgid "Issuer public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1747
-#: src/namestore/gnunet-namestore-fcfsd.c:1153
+#: src/abd/gnunet-abd.c:560 src/abd/gnunet-service-abd.c:1747
 #: src/namestore/gnunet-namestore.c:1001
+#: src/namestore/gnunet-namestore-fcfsd.c:1154
 #, c-format
 msgid "Failed to connect to namestore\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:825 src/abd/gnunet-abd.c:876
+#: src/abd/gnunet-abd.c:835 src/abd/gnunet-abd.c:886
 #, c-format
 msgid "Issuer public key not well-formed\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:834 src/abd/gnunet-abd.c:895
+#: src/abd/gnunet-abd.c:844 src/abd/gnunet-abd.c:905
 #, fuzzy, c-format
 msgid "Failed to connect to ABD\n"
 msgstr "Impossible d’ouvrir « %s ».\n"
 
-#: src/abd/gnunet-abd.c:840
+#: src/abd/gnunet-abd.c:850
 #, c-format
 msgid "You must provide issuer the attribute\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:847
+#: src/abd/gnunet-abd.c:857
 #, c-format
 msgid "ego required\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:857
+#: src/abd/gnunet-abd.c:867
 #, c-format
 msgid "Subject public key needed\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:866
+#: src/abd/gnunet-abd.c:876
 #, c-format
 msgid "Subject public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:901
+#: src/abd/gnunet-abd.c:911
 #, c-format
 msgid "You must provide issuer and subject attributes\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:957
+#: src/abd/gnunet-abd.c:970
 #, c-format
 msgid "Please specify name to lookup, subject key and issuer key!\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:978
+#: src/abd/gnunet-abd.c:991
 msgid "verify credential against attribute"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:985
+#: src/abd/gnunet-abd.c:998
 msgid ""
 "The public key of the subject to lookup thecredential for, or for issuer "
 "side storage: subject and its attributes"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:992
+#: src/abd/gnunet-abd.c:1005
 msgid "The private, signed delegate presented by the subject"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:999
+#: src/abd/gnunet-abd.c:1012
 msgid "The public key of the authority to verify the credential against"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1004
+#: src/abd/gnunet-abd.c:1017
 msgid "The ego/zone name to use"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1010
+#: src/abd/gnunet-abd.c:1023
 msgid "The issuer attribute to verify against or to issue"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1016
+#: src/abd/gnunet-abd.c:1029
 msgid ""
 "The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1021
+#: src/abd/gnunet-abd.c:1034
 msgid "collect credentials"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1026
+#: src/abd/gnunet-abd.c:1039
 msgid "Create and issue a credential issuer side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1031
+#: src/abd/gnunet-abd.c:1044
 msgid "Issue a credential subject side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1036
+#: src/abd/gnunet-abd.c:1049
 msgid "Create, sign and return a credential subject side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1043
+#: src/abd/gnunet-abd.c:1056
 msgid "Import signed credentials that should be issued to a zone/ego"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1047
+#: src/abd/gnunet-abd.c:1060
 msgid "Create private record entry."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1053 src/abd/gnunet-abd.c:1059
+#: src/abd/gnunet-abd.c:1066 src/abd/gnunet-abd.c:1072
 msgid "Indicates that the collect/verify process is done via forward search."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1072
+#: src/abd/gnunet-abd.c:1085
 msgid "GNUnet abd resolver tool"
 msgstr ""
 
-#: src/abd/gnunet-service-abd.c:1742 src/gns/gnunet-gns.c:288
+#: src/abd/gnunet-service-abd.c:1742 src/gns/gnunet-gns.c:292
 #, c-format
 msgid "Failed to connect to GNS\n"
 msgstr ""
@@ -375,28 +375,28 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:1129
 #: src/transport/plugin_transport_tcp.c:3706
 #: src/transport/tcp_service_legacy.c:594
-#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1094
-#: src/util/service.c:1100
+#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1090
+#: src/util/service.c:1096
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:452 src/transport/plugin_transport_tcp.c:1163
-#: src/transport/tcp_service_legacy.c:634 src/util/client.c:519
-#: src/util/service.c:1133
+#: src/transport/tcp_service_legacy.c:634 src/util/client.c:527
+#: src/util/service.c:1129
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:456 src/transport/plugin_transport_tcp.c:1167
-#: src/transport/tcp_service_legacy.c:638 src/util/client.c:524
-#: src/util/service.c:1137
+#: src/transport/tcp_service_legacy.c:638 src/util/client.c:532
+#: src/util/service.c:1133
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:484 src/transport/plugin_transport_tcp.c:1195
-#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1157
+#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1153
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -404,7 +404,7 @@ msgid ""
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:505 src/transport/plugin_transport_tcp.c:1213
-#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1175
+#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1171
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
@@ -412,7 +412,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:536
 #: src/transport/plugin_transport_http_server.c:2718
 #: src/transport/plugin_transport_tcp.c:1244
-#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1206
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1202
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Résolution de « %s » échouée : %s\n"
@@ -420,7 +420,7 @@ msgstr "Résolution de « %s » échouée : %s\n"
 #: src/arm/gnunet-service-arm.c:555
 #: src/transport/plugin_transport_http_server.c:2736
 #: src/transport/plugin_transport_tcp.c:1263
-#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1225
+#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1221
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr ""
@@ -491,14 +491,81 @@ msgstr ""
 msgid "Initiating shutdown as requested by client.\n"
 msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:896
-msgid "Stop logging\n"
-msgstr "Arrêter la journalisation\n"
+#: src/ats/gnunet-ats-solver-eval.c:2992 src/ats/gnunet-ats-solver-eval.c:3044
+#, c-format
+msgid ""
+"Could not load quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
 
-#: src/ats-tests/ats-testing-log.c:952
+#: src/ats/gnunet-ats-solver-eval.c:3011
 #, c-format
-msgid "Start logging `%s'\n"
-msgstr "Démarrer la journalisation « %s »\n"
+msgid ""
+"No outbound quota configured for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3063
+#, c-format
+msgid ""
+"No outbound quota configure for network `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3552 src/ats-tests/gnunet-solver-eval.c:997
+msgid "solver to use"
+msgstr "solveur utilisé"
+
+#: src/ats/gnunet-ats-solver-eval.c:3557
+#: src/ats-tests/gnunet-solver-eval.c:1003
+#: src/ats-tests/gnunet-solver-eval.c:1008
+msgid "experiment to use"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3564
+msgid "print logging"
+msgstr "afficher le journal"
+
+#: src/ats/gnunet-ats-solver-eval.c:3569
+msgid "save logging to disk"
+msgstr ""
+
+#: src/ats/gnunet-ats-solver-eval.c:3574
+msgid "disable normalization"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:326
+#, c-format
+msgid ""
+"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
+"%llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:336
+#, c-format
+msgid "%s quota configured for network `%s' is %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:382
+#, c-format
+msgid ""
+"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
+msgstr ""
+
+#: src/ats/gnunet-service-ats_plugins.c:474
+#, c-format
+msgid "Failed to initialize solver `%s'!\n"
+msgstr ""
+
+#: src/ats/plugin_ats_proportional.c:1142
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f \n"
+msgstr "fornat invalide : « %s »\n"
+
+#: src/ats/plugin_ats_proportional.c:1165
+#, fuzzy, c-format
+msgid "Invalid %s configuration %f\n"
+msgstr "fornat invalide : « %s »\n"
 
 #: src/ats-tests/ats-testing.c:420
 #, c-format
@@ -510,6 +577,15 @@ msgstr ""
 msgid "Failed to connect master peer [%u] with slave [%u]\n"
 msgstr ""
 
+#: src/ats-tests/ats-testing-log.c:896
+msgid "Stop logging\n"
+msgstr "Arrêter la journalisation\n"
+
+#: src/ats-tests/ats-testing-log.c:952
+#, c-format
+msgid "Start logging `%s'\n"
+msgstr "Démarrer la journalisation « %s »\n"
+
 #: src/ats-tests/gnunet-ats-sim.c:92
 #, c-format
 msgid ""
@@ -517,16 +593,6 @@ msgid ""
 "= %u KiB/s\n"
 msgstr ""
 
-#: src/ats-tests/gnunet-solver-eval.c:997 src/ats/gnunet-ats-solver-eval.c:3552
-msgid "solver to use"
-msgstr "solveur utilisé"
-
-#: src/ats-tests/gnunet-solver-eval.c:1003
-#: src/ats-tests/gnunet-solver-eval.c:1008
-#: src/ats/gnunet-ats-solver-eval.c:3557
-msgid "experiment to use"
-msgstr ""
-
 #: src/ats-tool/gnunet-ats.c:299
 #, c-format
 msgid "%u address resolutions had a timeout\n"
@@ -642,72 +708,6 @@ msgstr ""
 msgid "Print information about ATS state"
 msgstr ""
 
-#: src/ats/gnunet-ats-solver-eval.c:2992 src/ats/gnunet-ats-solver-eval.c:3044
-#, c-format
-msgid ""
-"Could not load quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3011
-#, c-format
-msgid ""
-"No outbound quota configured for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3063
-#, c-format
-msgid ""
-"No outbound quota configure for network `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3564
-msgid "print logging"
-msgstr "afficher le journal"
-
-#: src/ats/gnunet-ats-solver-eval.c:3569
-msgid "save logging to disk"
-msgstr ""
-
-#: src/ats/gnunet-ats-solver-eval.c:3574
-msgid "disable normalization"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:326
-#, c-format
-msgid ""
-"Could not load %s quota for network `%s':  `%s', assigning default bandwidth "
-"%llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:336
-#, c-format
-msgid "%s quota configured for network `%s' is %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:382
-#, c-format
-msgid ""
-"No %s-quota configured for network `%s', assigning default bandwidth %llu\n"
-msgstr ""
-
-#: src/ats/gnunet-service-ats_plugins.c:474
-#, c-format
-msgid "Failed to initialize solver `%s'!\n"
-msgstr ""
-
-#: src/ats/plugin_ats_proportional.c:1140
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f \n"
-msgstr "fornat invalide : « %s »\n"
-
-#: src/ats/plugin_ats_proportional.c:1163
-#, fuzzy, c-format
-msgid "Invalid %s configuration %f\n"
-msgstr "fornat invalide : « %s »\n"
-
 #: src/auction/gnunet-auction-create.c:163
 msgid "description of the item to be sold"
 msgstr ""
@@ -745,7 +745,7 @@ msgstr ""
 
 #: src/auction/gnunet-auction-info.c:77 src/auction/gnunet-auction-join.c:77
 #: src/conversation/gnunet-conversation-test.c:256
-#: src/revocation/gnunet-revocation.c:524 src/template/gnunet-template.c:75
+#: src/revocation/gnunet-revocation.c:552 src/template/gnunet-template.c:75
 msgid "help text"
 msgstr ""
 
@@ -834,28 +834,6 @@ msgstr ""
 msgid "Connection to conversation service lost, trying to reconnect\n"
 msgstr ""
 
-#: src/conversation/gnunet-conversation-test.c:120
-#, c-format
-msgid ""
-"\n"
-"End of transmission.  Have a GNU day.\n"
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:146
-#, c-format
-msgid ""
-"\n"
-"We are now playing your recording back.  If you can hear it, your audio "
-"settings are working..."
-msgstr ""
-
-#: src/conversation/gnunet-conversation-test.c:218
-#, c-format
-msgid ""
-"We will now be recording you for %s. After that time, the recording will be "
-"played back to you..."
-msgstr ""
-
 #: src/conversation/gnunet-conversation.c:264
 #, c-format
 msgid "Incoming call from `%s'. Please /accept %u or /cancel %u the call.\n"
@@ -1112,8 +1090,30 @@ msgstr ""
 msgid "Enables having a conversation with other GNUnet users."
 msgstr ""
 
-#: src/conversation/gnunet-helper-audio-playback-gst.c:363
+#: src/conversation/gnunet-conversation-test.c:120
+#, c-format
+msgid ""
+"\n"
+"End of transmission.  Have a GNU day.\n"
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:146
+#, c-format
+msgid ""
+"\n"
+"We are now playing your recording back.  If you can hear it, your audio "
+"settings are working..."
+msgstr ""
+
+#: src/conversation/gnunet-conversation-test.c:218
+#, c-format
+msgid ""
+"We will now be recording you for %s. After that time, the recording will be "
+"played back to you..."
+msgstr ""
+
 #: src/conversation/gnunet_gst.c:664
+#: src/conversation/gnunet-helper-audio-playback-gst.c:363
 #, c-format
 msgid "Read error from STDIN: %d %s\n"
 msgstr ""
@@ -1339,11 +1339,11 @@ msgstr ""
 msgid "# messages of type %u discarded (client busy)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:926
+#: src/core/gnunet-service-core.c:927
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:945
+#: src/core/gnunet-service-core.c:955
 #, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr ""
@@ -1372,111 +1372,111 @@ msgstr ""
 msgid "# PING messages transmitted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:978
+#: src/core/gnunet-service-core_kx.c:979
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:992
+#: src/core/gnunet-service-core_kx.c:993
 msgid "# duplicate ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1027
+#: src/core/gnunet-service-core_kx.c:1028
 msgid "# EPHEMERAL_KEYs rejected (bad signature)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1045
+#: src/core/gnunet-service-core_kx.c:1046
 #, c-format
 msgid ""
 "EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match "
 "our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1052
+#: src/core/gnunet-service-core_kx.c:1053
 msgid "# EPHEMERAL_KEY messages rejected due to time"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1070
+#: src/core/gnunet-service-core_kx.c:1071
 msgid "# valid ephemeral keys received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1179
+#: src/core/gnunet-service-core_kx.c:1180
 #: src/transport/gnunet-service-transport_validation.c:1133
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1189
+#: src/core/gnunet-service-core_kx.c:1190
 msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1238
+#: src/core/gnunet-service-core_kx.c:1239
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1263
+#: src/core/gnunet-service-core_kx.c:1264
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1276
+#: src/core/gnunet-service-core_kx.c:1277
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1333
-#: src/transport/gnunet-service-transport_validation.c:1475
+#: src/core/gnunet-service-core_kx.c:1334
+#: src/transport/gnunet-service-transport_validation.c:1476
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1341
+#: src/core/gnunet-service-core_kx.c:1342
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1349
+#: src/core/gnunet-service-core_kx.c:1350
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1388
+#: src/core/gnunet-service-core_kx.c:1389
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1428
+#: src/core/gnunet-service-core_kx.c:1429
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1440
+#: src/core/gnunet-service-core_kx.c:1441
 msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1449
+#: src/core/gnunet-service-core_kx.c:1450
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1625
+#: src/core/gnunet-service-core_kx.c:1626
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1636
+#: src/core/gnunet-service-core_kx.c:1637
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1640
+#: src/core/gnunet-service-core_kx.c:1641
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1718
-#: src/core/gnunet-service-core_kx.c:1745
+#: src/core/gnunet-service-core_kx.c:1719
+#: src/core/gnunet-service-core_kx.c:1746
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1731
+#: src/core/gnunet-service-core_kx.c:1732
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1776
+#: src/core/gnunet-service-core_kx.c:1777
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1785
+#: src/core/gnunet-service-core_kx.c:1786
 msgid "# bytes of payload decrypted"
 msgstr ""
 
@@ -1876,16 +1876,16 @@ msgstr ""
 msgid "Mysql database running\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:277
-#: src/datastore/plugin_datastore_postgres.c:890
+#: src/datastore/plugin_datastore_postgres.c:278
+#: src/datastore/plugin_datastore_postgres.c:891
 msgid "Postgress exec failure"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:851
+#: src/datastore/plugin_datastore_postgres.c:852
 msgid "Failed to drop table from database.\n"
 msgstr ""
 
-#: src/datastore/plugin_datastore_postgres.c:949
+#: src/datastore/plugin_datastore_postgres.c:950
 msgid "Postgres database running\n"
 msgstr ""
 
@@ -1996,6 +1996,53 @@ msgstr ""
 msgid "Prints all packets that go through the DHT."
 msgstr ""
 
+#: src/dht/gnunet_dht_profiler.c:922 src/testbed/gnunet-testbed-profiler.c:255
+#, c-format
+msgid "Exiting as the number of peers is %u\n"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:955 src/rps/gnunet-rps-profiler.c:3194
+#, fuzzy
+msgid "number of peers to start"
+msgstr "nombre de valeurs"
+
+#: src/dht/gnunet_dht_profiler.c:961
+msgid "number of PUTs to perform per peer"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:967 src/nse/gnunet-nse-profiler.c:872
+#: src/testbed/gnunet-testbed-profiler.c:305
+msgid "name of the file with the login information for the testbed"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:973
+msgid "delay between rounds for collecting statistics (default: 30 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:979
+msgid "delay to start doing PUTs (default: 1 sec)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:985
+msgid "delay to start doing GETs (default: 5 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:990
+msgid "replication degree for DHT PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:996
+msgid "chance that a peer is selected at random for PUTs"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1002
+msgid "timeout for DHT PUT and GET requests (default: 1 min)"
+msgstr ""
+
+#: src/dht/gnunet_dht_profiler.c:1023
+msgid "Measure quality and performance of the DHT service."
+msgstr ""
+
 #: src/dht/gnunet-dht-put.c:133
 msgid "Must provide KEY and DATA for DHT put!\n"
 msgstr ""
@@ -2241,53 +2288,6 @@ msgstr ""
 msgid "# DHT requests combined"
 msgstr ""
 
-#: src/dht/gnunet_dht_profiler.c:922 src/testbed/gnunet-testbed-profiler.c:255
-#, c-format
-msgid "Exiting as the number of peers is %u\n"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:955 src/rps/gnunet-rps-profiler.c:3194
-#, fuzzy
-msgid "number of peers to start"
-msgstr "nombre de valeurs"
-
-#: src/dht/gnunet_dht_profiler.c:961
-msgid "number of PUTs to perform per peer"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:967 src/nse/gnunet-nse-profiler.c:872
-#: src/testbed/gnunet-testbed-profiler.c:305
-msgid "name of the file with the login information for the testbed"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:973
-msgid "delay between rounds for collecting statistics (default: 30 sec)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:979
-msgid "delay to start doing PUTs (default: 1 sec)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:985
-msgid "delay to start doing GETs (default: 5 min)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:990
-msgid "replication degree for DHT PUTs"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:996
-msgid "chance that a peer is selected at random for PUTs"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1002
-msgid "timeout for DHT PUT and GET requests (default: 1 min)"
-msgstr ""
-
-#: src/dht/gnunet_dht_profiler.c:1023
-msgid "Measure quality and performance of the DHT service."
-msgstr ""
-
 #: src/dht/plugin_block_dht.c:189
 #, c-format
 msgid "Block not of type %u\n"
@@ -2631,56 +2631,56 @@ msgstr ""
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1141
+#: src/fs/fs_api.c:1173
 #, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1667
+#: src/fs/fs_api.c:1724
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1682
+#: src/fs/fs_api.c:1739
 #, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2366
+#: src/fs/fs_api.c:2468
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2377
+#: src/fs/fs_api.c:2479
 #, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2513 src/fs/fs_api.c:2759
+#: src/fs/fs_api.c:2627 src/fs/fs_api.c:2873
 #, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2531
+#: src/fs/fs_api.c:2645
 #, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2547 src/fs/fs_api.c:2567 src/fs/fs_api.c:3058
+#: src/fs/fs_api.c:2661 src/fs/fs_api.c:2681 src/fs/fs_api.c:3180
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2749
+#: src/fs/fs_api.c:2863
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3002
+#: src/fs/fs_api.c:3124
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3097
+#: src/fs/fs_api.c:3219
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2776,17 +2776,17 @@ msgstr ""
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:227
+#: src/fs/fs_namespace.c:233
 #, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:321
+#: src/fs/fs_namespace.c:330
 #, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:463
+#: src/fs/fs_namespace.c:472
 msgid "Failed to connect to datastore."
 msgstr ""
 
@@ -2997,67 +2997,67 @@ msgstr "Argument invalide « %s »\n"
 msgid "Unrecognized URI type"
 msgstr "Type d’URI non reconnu"
 
-#: src/fs/fs_uri.c:1072 src/fs/fs_uri.c:1099
+#: src/fs/fs_uri.c:1071 src/fs/fs_uri.c:1098
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1105
+#: src/fs/fs_uri.c:1104
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:230
+#: src/fs/gnunet-auto-share.c:234
 #, c-format
 msgid "Failed to load state: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:278 src/fs/gnunet-auto-share.c:287
-#: src/fs/gnunet-auto-share.c:295
+#: src/fs/gnunet-auto-share.c:286 src/fs/gnunet-auto-share.c:295
+#: src/fs/gnunet-auto-share.c:303
 #, c-format
 msgid "Failed to save state to file %s\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:392
+#: src/fs/gnunet-auto-share.c:400
 #, c-format
 msgid "Publication of `%s' done\n"
 msgstr "Publication de « %s » terminée\n"
 
-#: src/fs/gnunet-auto-share.c:471
+#: src/fs/gnunet-auto-share.c:479
 #, c-format
 msgid "Publishing `%s'\n"
 msgstr "Publication de « %s »\n"
 
-#: src/fs/gnunet-auto-share.c:483
+#: src/fs/gnunet-auto-share.c:491
 #, c-format
 msgid "Failed to run `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:653
+#: src/fs/gnunet-auto-share.c:661
 #, c-format
 msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:703 src/fs/gnunet-publish.c:888
+#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:888
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:710
+#: src/fs/gnunet-auto-share.c:718
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:716 src/fs/gnunet-publish.c:893
+#: src/fs/gnunet-auto-share.c:724 src/fs/gnunet-publish.c:893
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:723 src/fs/gnunet-publish.c:938
+#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:938
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:730 src/fs/gnunet-publish.c:951
+#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:951
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:753
+#: src/fs/gnunet-auto-share.c:761
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
@@ -3187,6 +3187,14 @@ msgid ""
 "chk/...)"
 msgstr ""
 
+#: src/fs/gnunet-fs.c:128
+msgid "print a list of all indexed files"
+msgstr ""
+
+#: src/fs/gnunet-fs.c:141
+msgid "Special file-sharing operations"
+msgstr ""
+
 #: src/fs/gnunet-fs-profiler.c:211
 msgid "run the experiment with COUNT peers"
 msgstr ""
@@ -3203,14 +3211,6 @@ msgstr ""
 msgid "run a testbed to measure file-sharing performance"
 msgstr ""
 
-#: src/fs/gnunet-fs.c:128
-msgid "print a list of all indexed files"
-msgstr ""
-
-#: src/fs/gnunet-fs.c:141
-msgid "Special file-sharing operations"
-msgstr ""
-
 #: src/fs/gnunet-publish.c:219 src/fs/gnunet-publish.c:234
 #, c-format
 msgid "Publishing `%s' at %llu/%llu (%s remaining)\n"
@@ -3464,7 +3464,7 @@ msgstr ""
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1307 src/hostlist/gnunet-daemon-hostlist.c:355
+#: src/fs/gnunet-service-fs.c:1316 src/hostlist/gnunet-daemon-hostlist.c:343
 #: src/topology/gnunet-daemon-topology.c:1098
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
@@ -3574,40 +3574,40 @@ msgid "# migration stop messages sent"
 msgstr ""
 
 #: src/fs/gnunet-service-fs_indexing.c:130
-#: src/fs/gnunet-service-fs_indexing.c:185
+#: src/fs/gnunet-service-fs_indexing.c:188
 #, c-format
 msgid "Could not open `%s'.\n"
 msgstr "Impossible d’ouvrir « %s ».\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:144
+#: src/fs/gnunet-service-fs_indexing.c:147
 #, c-format
 msgid "Error writing `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:241
+#: src/fs/gnunet-service-fs_indexing.c:244
 #, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:314
+#: src/fs/gnunet-service-fs_indexing.c:317
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:328
+#: src/fs/gnunet-service-fs_indexing.c:331
 #, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:332
+#: src/fs/gnunet-service-fs_indexing.c:335
 msgid "not indexed"
 msgstr "non indexé"
 
-#: src/fs/gnunet-service-fs_indexing.c:346
+#: src/fs/gnunet-service-fs_indexing.c:349
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:452
+#: src/fs/gnunet-service-fs_indexing.c:455
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3781,66 +3781,66 @@ msgstr ""
 msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:132
+#: src/gns/gnunet-bcd.c:133
 #, c-format
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:346
+#: src/gns/gnunet-bcd.c:347
 #, c-format
 msgid "Invalid port number %u.  Exiting.\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:351
+#: src/gns/gnunet-bcd.c:352
 #, c-format
 msgid "Businesscard HTTP server starts on %u\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:371
+#: src/gns/gnunet-bcd.c:372
 #, c-format
 msgid "Could not start businesscard HTTP server on port %u\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:508
+#: src/gns/gnunet-bcd.c:509
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:521
+#: src/gns/gnunet-bcd.c:522
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:213
+#: src/gns/gnunet-dns2gns.c:239
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:418
+#: src/gns/gnunet-dns2gns.c:442
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:434
+#: src/gns/gnunet-dns2gns.c:458
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:442
+#: src/gns/gnunet-dns2gns.c:466
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:603
+#: src/gns/gnunet-dns2gns.c:627
 msgid "No DNS server specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:752
+#: src/gns/gnunet-dns2gns.c:776
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:758
+#: src/gns/gnunet-dns2gns.c:782
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:775
+#: src/gns/gnunet-dns2gns.c:799
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -3856,6 +3856,49 @@ msgstr ""
 msgid "look for GNS2DNS records instead of ANY"
 msgstr ""
 
+#: src/gns/gnunet-gns.c:257
+#, c-format
+msgid "`%s' is not a valid DNS domain name\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:267 src/util/dnsparser.c:254
+#, c-format
+msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:281
+msgid "Cannot resolve using GNS: GNUnet peer not running\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:305
+#, c-format
+msgid "Invalid typename specified, assuming `ANY'\n"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:340
+msgid "Lookup a record for the given name"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:346
+msgid "Specify the type of the record to lookup"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:352
+msgid "Specify a timeout for the lookup"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:356
+msgid "No unneeded output"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:361
+msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
+msgstr ""
+
+#: src/gns/gnunet-gns.c:375
+msgid "GNUnet GNS resolver tool"
+msgstr ""
+
 #: src/gns/gnunet-gns-import.c:486
 msgid "This program will import some GNS authorities into your GNS namestore."
 msgstr ""
@@ -3935,89 +3978,46 @@ msgstr ""
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2922 src/rest/gnunet-rest-server.c:709
+#: src/gns/gnunet-gns-proxy.c:2922 src/rest/gnunet-rest-server.c:713
 msgid "Failed to pass client to MHD\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3268
+#: src/gns/gnunet-gns-proxy.c:3271
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3300
+#: src/gns/gnunet-gns-proxy.c:3303
 #, c-format
 msgid "Unsupported socks command %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3386
+#: src/gns/gnunet-gns-proxy.c:3389
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3727
+#: src/gns/gnunet-gns-proxy.c:3730
 #, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3861
+#: src/gns/gnunet-gns-proxy.c:3864
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3866
+#: src/gns/gnunet-gns-proxy.c:3869
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3870
+#: src/gns/gnunet-gns-proxy.c:3873
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3896
+#: src/gns/gnunet-gns-proxy.c:3899
 msgid "GNUnet GNS proxy"
 msgstr ""
 
-#: src/gns/gnunet-gns.c:253
-#, c-format
-msgid "`%s' is not a valid DNS domain name\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:263 src/util/dnsparser.c:254
-#, c-format
-msgid "Failed to convert DNS IDNA name `%s' to UTF-8: %s\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:277
-msgid "Cannot resolve using GNS: GNUnet peer not running\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:301
-#, c-format
-msgid "Invalid typename specified, assuming `ANY'\n"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:336
-msgid "Lookup a record for the given name"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:342
-msgid "Specify the type of the record to lookup"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:348
-msgid "Specify a timeout for the lookup"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:352
-msgid "No unneeded output"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:357
-msgid "DNS Compatibility: Name is passed in IDNA instead of UTF-8"
-msgstr ""
-
-#: src/gns/gnunet-gns.c:371
-msgid "GNUnet GNS resolver tool"
-msgstr ""
-
 #: src/gns/gnunet-service-gns.c:505
 msgid "Properly base32-encoded public key required"
 msgstr ""
@@ -4027,8 +4027,8 @@ msgid "Failed to connect to the namecache!\n"
 msgstr ""
 
 #: src/gns/gnunet-service-gns.c:560
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:444
 #: src/zonemaster/gnunet-service-zonemaster.c:887
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:444
 msgid "Could not connect to DHT!\n"
 msgstr ""
 
@@ -4055,50 +4055,50 @@ msgstr ""
 msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr "Extension « %s » introuvable\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:932
+#: src/gns/gnunet-service-gns_resolver.c:938
 msgid "Failed to parse DNS response\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1123
+#: src/gns/gnunet-service-gns_resolver.c:1129
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1439
+#: src/gns/gnunet-service-gns_resolver.c:1447
 #, c-format
 msgid "VPN returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1896
+#: src/gns/gnunet-service-gns_resolver.c:1909
 #, c-format
 msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1909
+#: src/gns/gnunet-service-gns_resolver.c:1922
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1952
+#: src/gns/gnunet-service-gns_resolver.c:1965
 #, c-format
 msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2376
+#: src/gns/gnunet-service-gns_resolver.c:2385
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2399
+#: src/gns/gnunet-service-gns_resolver.c:2408
 #, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2567
+#: src/gns/gnunet-service-gns_resolver.c:2576
 #, c-format
 msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2707
+#: src/gns/gnunet-service-gns_resolver.c:2716
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
@@ -4128,7 +4128,7 @@ msgstr ""
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr ""
 
-#: src/gns/plugin_rest_gns.c:443
+#: src/gns/plugin_rest_gns.c:445
 msgid "Gns REST API initialized\n"
 msgstr ""
 
@@ -4273,31 +4273,31 @@ msgstr ""
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:316
+#: src/hostlist/gnunet-daemon-hostlist.c:306
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:377
+#: src/hostlist/gnunet-daemon-hostlist.c:364
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:383
+#: src/hostlist/gnunet-daemon-hostlist.c:369
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:388
+#: src/hostlist/gnunet-daemon-hostlist.c:374
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:393
+#: src/hostlist/gnunet-daemon-hostlist.c:378
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:409
+#: src/hostlist/gnunet-daemon-hostlist.c:393
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -4321,7 +4321,7 @@ msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:677
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1455
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1459
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -4372,7 +4372,7 @@ msgid "# hostlist downloads initiated"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1144
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1715
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1726
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
@@ -4401,65 +4401,65 @@ msgstr ""
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1448
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1452
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1451
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1455
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1502
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1506
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1509
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1513
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1534
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1553
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1545
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1564
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1547
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1558
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1644
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1655
 #: src/transport/plugin_transport_http_client.c:2301
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1673
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1684
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1686
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1697
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1700
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1711
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:172
+#: src/hostlist/gnunet-daemon-hostlist_server.c:173
 msgid "bytes in hostlist"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:198
+#: src/hostlist/gnunet-daemon-hostlist_server.c:199
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:235
-#: src/hostlist/gnunet-daemon-hostlist_server.c:526
+#: src/hostlist/gnunet-daemon-hostlist_server.c:236
+#: src/hostlist/gnunet-daemon-hostlist_server.c:527
 #: src/peerinfo-tool/gnunet-peerinfo.c:379
 #: src/peerinfo-tool/gnunet-peerinfo.c:515
 #: src/topology/gnunet-daemon-topology.c:799
@@ -4467,193 +4467,198 @@ msgstr ""
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:256
+#: src/hostlist/gnunet-daemon-hostlist_server.c:257
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:274
+#: src/hostlist/gnunet-daemon-hostlist_server.c:275
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:376
+#: src/hostlist/gnunet-daemon-hostlist_server.c:377
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:380
+#: src/hostlist/gnunet-daemon-hostlist_server.c:381
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:393
+#: src/hostlist/gnunet-daemon-hostlist_server.c:394
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:398
+#: src/hostlist/gnunet-daemon-hostlist_server.c:399
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:408
+#: src/hostlist/gnunet-daemon-hostlist_server.c:409
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:411
+#: src/hostlist/gnunet-daemon-hostlist_server.c:412
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:417
+#: src/hostlist/gnunet-daemon-hostlist_server.c:418
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:419
+#: src/hostlist/gnunet-daemon-hostlist_server.c:420
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:460
+#: src/hostlist/gnunet-daemon-hostlist_server.c:461
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:673
-#: src/transport/gnunet-service-transport.c:2657
+#: src/hostlist/gnunet-daemon-hostlist_server.c:674
+#: src/transport/gnunet-service-transport.c:2659
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:684
+#: src/hostlist/gnunet-daemon-hostlist_server.c:685
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:696
+#: src/hostlist/gnunet-daemon-hostlist_server.c:697
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:713
+#: src/hostlist/gnunet-daemon-hostlist_server.c:714
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:728
+#: src/hostlist/gnunet-daemon-hostlist_server.c:729
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:742
+#: src/hostlist/gnunet-daemon-hostlist_server.c:743
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:764
+#: src/hostlist/gnunet-daemon-hostlist_server.c:765
 #, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:785
+#: src/hostlist/gnunet-daemon-hostlist_server.c:786
 #, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:828
+#: src/hostlist/gnunet-daemon-hostlist_server.c:829
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:193
+#: src/identity/gnunet-identity.c:209
 #, c-format
 msgid "Failed to create ego: %s\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:233
+#: src/identity/gnunet-identity.c:250
 #, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:391
+#: src/identity/gnunet-identity.c:445
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:396
+#: src/identity/gnunet-identity.c:450
 msgid "delete ego NAME "
 msgstr ""
 
-#: src/identity/gnunet-identity.c:400
+#: src/identity/gnunet-identity.c:455
+msgid ""
+"set the private key for the identity to PRIVATE_KEY (use together with -C)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:459
 msgid "display all egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:404
+#: src/identity/gnunet-identity.c:463
 #, fuzzy
 msgid "reduce output"
 msgstr "sortie verbeuse"
 
-#: src/identity/gnunet-identity.c:411
+#: src/identity/gnunet-identity.c:470
 msgid ""
 "set default identity to NAME for a subsystem SUBSYSTEM (use together with -"
 "s) or restrict results to NAME (use together with -d)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:415
+#: src/identity/gnunet-identity.c:474
 msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:419
+#: src/identity/gnunet-identity.c:478
 msgid "display private keys as well"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:426
+#: src/identity/gnunet-identity.c:485
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:438
+#: src/identity/gnunet-identity.c:500
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:484
+#: src/identity/gnunet-service-identity.c:503
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:507
+#: src/identity/gnunet-service-identity.c:528
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:597
-#: src/identity/gnunet-service-identity.c:871
-#: src/identity/gnunet-service-identity.c:991
+#: src/identity/gnunet-service-identity.c:621
+#: src/identity/gnunet-service-identity.c:898
+#: src/identity/gnunet-service-identity.c:1018
 #, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:607
+#: src/identity/gnunet-service-identity.c:631
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:700
+#: src/identity/gnunet-service-identity.c:726
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:847
+#: src/identity/gnunet-service-identity.c:874
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:889
-#: src/identity/gnunet-service-identity.c:1009
+#: src/identity/gnunet-service-identity.c:916
+#: src/identity/gnunet-service-identity.c:1035
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:1043
+#: src/identity/gnunet-service-identity.c:1072
 #, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:1099
+#: src/identity/gnunet-service-identity.c:1130
 #, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:1108
+#: src/identity/gnunet-service-identity.c:1139
 #, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr ""
 
-#: src/identity/plugin_rest_identity.c:1359
+#: src/identity/plugin_rest_identity.c:1406
 msgid "Identity REST API initialized\n"
 msgstr ""
 
@@ -4702,7 +4707,7 @@ msgstr "fornat invalide : « %s »\n"
 msgid "You must specify a name\n"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:1608
+#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:1639
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -4710,7 +4715,7 @@ msgstr ""
 msgid "specifies the public key of the zone to look in"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:1669
+#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:1700
 msgid "GNUnet zone manipulation tool"
 msgstr ""
 
@@ -4757,68 +4762,6 @@ msgstr ""
 msgid "Failed to setup database at `%s'\n"
 msgstr "Échec du démarrage de %s\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:551
-#, c-format
-msgid "Unsupported form value `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:578
-#, c-format
-msgid "Failed to create record for domain `%s': %s\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:599
-msgid "Error when mapping zone to name\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:631
-#, c-format
-msgid "Found existing name `%s' for the given key\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:693
-#, c-format
-msgid "Found %u existing records for domain `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:783
-#, c-format
-msgid "Failed to create page for `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:802
-#, c-format
-msgid "Failed to setup post processor for `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:839
-msgid "Domain name must not contain `.'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:848
-msgid "Domain name must not contain `+'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1083
-msgid "No ego configured for `fcfsd` subsystem\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1114
-msgid "Failed to start HTTP server\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1162
-msgid "Failed to connect to identity\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1189
-msgid "name of the zone that is to be managed by FCFSD"
-msgstr ""
-
-#: src/namestore/gnunet-namestore-fcfsd.c:1209
-msgid "GNU Name System First Come First Serve name registration service"
-msgstr ""
-
 #: src/namestore/gnunet-namestore.c:334
 #, c-format
 msgid "Adding record failed: %s\n"
@@ -4878,9 +4821,10 @@ msgstr "Résolution de « %s » échouée : %s\n"
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1014 src/namestore/gnunet-namestore.c:1047
-#: src/namestore/gnunet-namestore.c:1057 src/namestore/gnunet-namestore.c:1075
-#: src/namestore/gnunet-namestore.c:1096 src/namestore/gnunet-namestore.c:1123
+#: src/namestore/gnunet-namestore.c:1014 src/namestore/gnunet-namestore.c:1065
+#: src/namestore/gnunet-namestore.c:1075 src/namestore/gnunet-namestore.c:1104
+#: src/namestore/gnunet-namestore.c:1125 src/namestore/gnunet-namestore.c:1152
+#: src/namestore/gnunet-namestore.c:1228
 #, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr ""
@@ -4889,52 +4833,58 @@ msgstr ""
 msgid "replace"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1049 src/namestore/gnunet-namestore.c:1059
-#: src/namestore/gnunet-namestore.c:1077 src/namestore/gnunet-namestore.c:1098
+#: src/namestore/gnunet-namestore.c:1045
+#, c-format
+msgid "Invalid nick `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1067 src/namestore/gnunet-namestore.c:1077
+#: src/namestore/gnunet-namestore.c:1106 src/namestore/gnunet-namestore.c:1127
+#: src/namestore/gnunet-namestore.c:1230
 msgid "add"
 msgstr "ajouter"
 
-#: src/namestore/gnunet-namestore.c:1067
+#: src/namestore/gnunet-namestore.c:1085
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1086
+#: src/namestore/gnunet-namestore.c:1095
+#, c-format
+msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1115
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1105
+#: src/namestore/gnunet-namestore.c:1134 src/namestore/gnunet-namestore.c:1237
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1125
+#: src/namestore/gnunet-namestore.c:1154
 msgid "del"
 msgstr "supprimer"
 
-#: src/namestore/gnunet-namestore.c:1168
+#: src/namestore/gnunet-namestore.c:1197
 #, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1191
+#: src/namestore/gnunet-namestore.c:1220
 #: src/peerinfo-tool/gnunet-peerinfo.c:736
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "URI invalide « %s »\n"
 
-#: src/namestore/gnunet-namestore.c:1217
-#, c-format
-msgid "Invalid nick `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1259
+#: src/namestore/gnunet-namestore.c:1290
 #, c-format
 msgid "Label `%s' contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1309
+#: src/namestore/gnunet-namestore.c:1340
 #, c-format
 msgid ""
 "No default identity configured for `namestore' subsystem\n"
@@ -4942,103 +4892,165 @@ msgid ""
 "Run gnunet-identity -d to get a list of choices for $NAME\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1374
+#: src/namestore/gnunet-namestore.c:1405
 #, c-format
 msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1403
+#: src/namestore/gnunet-namestore.c:1434
 #, c-format
 msgid "Cannot connect to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1450
+#: src/namestore/gnunet-namestore.c:1481
 msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1462
+#: src/namestore/gnunet-namestore.c:1493
 #, c-format
 msgid "Invalid expiration time `%s' (must be without unit)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1474 src/namestore/gnunet-namestore.c:1490
-#: src/namestore/gnunet-namestore.c:1507
+#: src/namestore/gnunet-namestore.c:1505 src/namestore/gnunet-namestore.c:1521
+#: src/namestore/gnunet-namestore.c:1538
 #, c-format
 msgid "Missing entries in record line `%s'.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1482
+#: src/namestore/gnunet-namestore.c:1513
 #, fuzzy, c-format
 msgid "Unknown record type `%s'\n"
 msgstr "Commande « %s » inconnue\n"
 
-#: src/namestore/gnunet-namestore.c:1520
+#: src/namestore/gnunet-namestore.c:1551
 #, fuzzy, c-format
 msgid "Invalid record data for type %s: `%s'.\n"
 msgstr "fornat invalide : « %s »\n"
 
-#: src/namestore/gnunet-namestore.c:1577
+#: src/namestore/gnunet-namestore.c:1608
 msgid "add record"
 msgstr "ajouter un enregistrement"
 
-#: src/namestore/gnunet-namestore.c:1580
+#: src/namestore/gnunet-namestore.c:1611
 msgid "delete record"
 msgstr "suprimer un enregistrement"
 
-#: src/namestore/gnunet-namestore.c:1584
+#: src/namestore/gnunet-namestore.c:1615
 msgid "display records"
 msgstr "afficher les enregistrements"
 
-#: src/namestore/gnunet-namestore.c:1591
+#: src/namestore/gnunet-namestore.c:1622
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1597
+#: src/namestore/gnunet-namestore.c:1628
 msgid "set the desired nick name for the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1602
+#: src/namestore/gnunet-namestore.c:1633
 msgid "monitor changes in the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1614
+#: src/namestore/gnunet-namestore.c:1645
 msgid "determine our name for the given PKEY"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1621
+#: src/namestore/gnunet-namestore.c:1652
 msgid ""
 "set record set to values given by (possibly multiple) RECORDLINES; can be "
 "specified multiple times"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1627
+#: src/namestore/gnunet-namestore.c:1658
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1632
+#: src/namestore/gnunet-namestore.c:1663
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1638
+#: src/namestore/gnunet-namestore.c:1669
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1642
+#: src/namestore/gnunet-namestore.c:1673
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1648
+#: src/namestore/gnunet-namestore.c:1679
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1654
+#: src/namestore/gnunet-namestore.c:1685
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-service-namestore.c:864
+#: src/namestore/gnunet-namestore-fcfsd.c:552
+#, c-format
+msgid "Unsupported form value `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:579
+#, c-format
+msgid "Failed to create record for domain `%s': %s\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:600
+msgid "Error when mapping zone to name\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:632
+#, c-format
+msgid "Found existing name `%s' for the given key\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:694
+#, c-format
+msgid "Found %u existing records for domain `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:784
+#, c-format
+msgid "Failed to create page for `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:803
+#, c-format
+msgid "Failed to setup post processor for `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:840
+msgid "Domain name must not contain `.'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:849
+msgid "Domain name must not contain `+'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1084
+msgid "No ego configured for `fcfsd` subsystem\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1115
+msgid "Failed to start HTTP server\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1163
+msgid "Failed to connect to identity\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1190
+msgid "name of the zone that is to be managed by FCFSD"
+msgstr ""
+
+#: src/namestore/gnunet-namestore-fcfsd.c:1210
+msgid "GNU Name System First Come First Serve name registration service"
+msgstr ""
+
+#: src/namestore/gnunet-service-namestore.c:866
 #, c-format
 msgid "Failed to replicate block in namecache: %s\n"
 msgstr ""
@@ -5069,7 +5081,7 @@ msgstr ""
 msgid "Flat file database running\n"
 msgstr ""
 
-#: src/namestore/plugin_rest_namestore.c:925
+#: src/namestore/plugin_rest_namestore.c:1093
 msgid "Namestore REST API initialized\n"
 msgstr ""
 
@@ -5344,6 +5356,10 @@ msgstr ""
 msgid "`upnpc' command not found\n"
 msgstr ""
 
+#: src/nse/gnunet-nse.c:124
+msgid "Show network size estimates from NSE service."
+msgstr ""
+
 #: src/nse/gnunet-nse-profiler.c:857
 msgid "limit to the number of connections to NSE services, 0 for none"
 msgstr ""
@@ -5368,13 +5384,63 @@ msgstr ""
 msgid "Measure quality and performance of the NSE service."
 msgstr ""
 
-#: src/nse/gnunet-nse.c:124
-msgid "Show network size estimates from NSE service."
+#: src/nse/gnunet-service-nse.c:1438
+#: src/revocation/gnunet-service-revocation.c:842 src/util/gnunet-scrypt.c:250
+msgid "Value is too large.\n"
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1437
-#: src/revocation/gnunet-service-revocation.c:846 src/util/gnunet-scrypt.c:247
-msgid "Value is too large.\n"
+#: src/peerinfo/gnunet-service-peerinfo.c:175
+#, c-format
+msgid "Removing expired address of transport `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:306
+#, c-format
+msgid "Failed to parse HELLO in file `%s': %s\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:323
+#: src/peerinfo/gnunet-service-peerinfo.c:348
+#, c-format
+msgid "Failed to parse HELLO in file `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:426
+msgid "# peers known"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:468
+#, c-format
+msgid ""
+"File `%s' in directory `%s' does not match naming convention. Removed.\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:624
+#, c-format
+msgid "Scanning directory `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:631
+#, c-format
+msgid "Still no peers found in `%s'!\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1024
+#, c-format
+msgid "Cleaning up directory `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1319
+#, c-format
+msgid "Importing HELLOs from `%s'\n"
+msgstr ""
+
+#: src/peerinfo/gnunet-service-peerinfo.c:1332
+msgid "Skipping import of included HELLOs\n"
+msgstr ""
+
+#: src/peerinfo/peerinfo_api.c:217
+msgid "Failed to receive response from `PEERINFO' service."
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:237
@@ -5388,7 +5454,7 @@ msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:292
-#: src/peerinfo-tool/plugin_rest_peerinfo.c:499
+#: src/peerinfo-tool/plugin_rest_peerinfo.c:501
 #, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr ""
@@ -5467,64 +5533,10 @@ msgstr ""
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/plugin_rest_peerinfo.c:795
+#: src/peerinfo-tool/plugin_rest_peerinfo.c:797
 msgid "Peerinfo REST API initialized\n"
 msgstr ""
 
-#: src/peerinfo/gnunet-service-peerinfo.c:175
-#, c-format
-msgid "Removing expired address of transport `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:306
-#, c-format
-msgid "Failed to parse HELLO in file `%s': %s\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:323
-#: src/peerinfo/gnunet-service-peerinfo.c:348
-#, c-format
-msgid "Failed to parse HELLO in file `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:426
-msgid "# peers known"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:468
-#, c-format
-msgid ""
-"File `%s' in directory `%s' does not match naming convention. Removed.\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:624
-#, c-format
-msgid "Scanning directory `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:631
-#, c-format
-msgid "Still no peers found in `%s'!\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1024
-#, c-format
-msgid "Cleaning up directory `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1319
-#, c-format
-msgid "Importing HELLOs from `%s'\n"
-msgstr ""
-
-#: src/peerinfo/gnunet-service-peerinfo.c:1332
-msgid "Skipping import of included HELLOs\n"
-msgstr ""
-
-#: src/peerinfo/peerinfo_api.c:217
-msgid "Failed to receive response from `PEERINFO' service."
-msgstr ""
-
 #: src/peerstore/gnunet-peerstore.c:92
 msgid "peerstore"
 msgstr ""
@@ -5625,82 +5637,94 @@ msgstr ""
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:617
+#: src/reclaim/gnunet-reclaim.c:799
 #, c-format
 msgid "Ego is required\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:624
+#: src/reclaim/gnunet-reclaim.c:806
 #, c-format
 msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:631
+#: src/reclaim/gnunet-reclaim.c:813
 #, c-format
 msgid "Requesting party key is required!\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:649
+#: src/reclaim/gnunet-reclaim.c:831
 msgid "Add an attribute NAME"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:654
+#: src/reclaim/gnunet-reclaim.c:836
 msgid "Delete the attribute with ID"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:659
+#: src/reclaim/gnunet-reclaim.c:841
 msgid "The attribute VALUE"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:664
+#: src/reclaim/gnunet-reclaim.c:846
 msgid "The EGO to use"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:670
+#: src/reclaim/gnunet-reclaim.c:852
 msgid "Specify the relying party for issue"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:674
+#: src/reclaim/gnunet-reclaim.c:856
 msgid "List attributes for EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:681
+#: src/reclaim/gnunet-reclaim.c:860
+msgid "List attestations for EGO"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:866
+msgid "Attestation to use for attribute"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:871
+msgid "Attestation name"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:877
 msgid "Issue a ticket for a set of attributes separated by comma"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:686
+#: src/reclaim/gnunet-reclaim.c:882
 msgid "Consume a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:691
+#: src/reclaim/gnunet-reclaim.c:887
 msgid "Revoke a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:696
+#: src/reclaim/gnunet-reclaim.c:892
 msgid "Type of attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:700
+#: src/reclaim/gnunet-reclaim.c:896
 msgid "List tickets of ego"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:706
+#: src/reclaim/gnunet-reclaim.c:902
 msgid "Expiration interval of the attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:714
+#: src/reclaim/gnunet-reclaim.c:910
 msgid "re:claimID command line tool"
 msgstr ""
 
-#: src/reclaim/plugin_rest_openid_connect.c:2340
+#: src/reclaim/plugin_rest_openid_connect.c:2481
 msgid "OpenID Connect REST API initialized\n"
 msgstr ""
 
-#: src/reclaim/plugin_rest_reclaim.c:1899
+#: src/reclaim/plugin_rest_reclaim.c:1476
 msgid "Identity Provider REST API initialized\n"
 msgstr ""
 
-#: src/reclaim/reclaim_api.c:436
+#: src/reclaim/reclaim_api.c:540
 #, fuzzy
 msgid "failed to store record\n"
 msgstr "Échec du démarrage de %s\n"
@@ -5789,11 +5813,11 @@ msgstr ""
 msgid "Search string `%s' is too long!\n"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:1047
+#: src/rest/gnunet-rest-server.c:1051
 msgid "GNUnet REST server"
 msgstr ""
 
-#: src/rest/plugin_rest_config.c:401
+#: src/rest/plugin_rest_config.c:402
 msgid "CONFIG REST API initialized\n"
 msgstr ""
 
@@ -5801,135 +5825,165 @@ msgstr ""
 msgid "COPYING REST API initialized\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:127
+#: src/revocation/gnunet-revocation.c:114
+#, fuzzy
+msgid "Shutting down...\n"
+msgstr "En cous de démarrage %s…\n"
+
+#: src/revocation/gnunet-revocation.c:146
 #, c-format
 msgid "Key `%s' is valid\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:131
+#: src/revocation/gnunet-revocation.c:150
 #, c-format
 msgid "Key `%s' has been revoked\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:135
+#: src/revocation/gnunet-revocation.c:154
 msgid "Internal error\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:161
+#: src/revocation/gnunet-revocation.c:180
 #, c-format
 msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:164
+#: src/revocation/gnunet-revocation.c:183
 msgid "Revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:170
+#: src/revocation/gnunet-revocation.c:189
 #, c-format
 msgid "Key for ego `%s' has been successfully revoked\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:173
+#: src/revocation/gnunet-revocation.c:192
 msgid "Revocation successful.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:179
+#: src/revocation/gnunet-revocation.c:198
 msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:312
+#: src/revocation/gnunet-revocation.c:251
+msgid "Cancelling calculation.\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:296
 #, c-format
 msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:338
+#: src/revocation/gnunet-revocation.c:335
 #, c-format
 msgid "Ego `%s' not found.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:351
+#: src/revocation/gnunet-revocation.c:349
 #, c-format
 msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:368
+#: src/revocation/gnunet-revocation.c:359
 msgid "Revocation certificate ready\n"
 msgstr ""
 
+#: src/revocation/gnunet-revocation.c:371
+msgid "Continuing calculation where left off...\n"
+msgstr ""
+
 #: src/revocation/gnunet-revocation.c:378
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:409
+#: src/revocation/gnunet-revocation.c:416
 #, c-format
 msgid "Public key `%s' malformed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:419
+#: src/revocation/gnunet-revocation.c:426
 msgid ""
 "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:438
+#: src/revocation/gnunet-revocation.c:456
 msgid "No filename to store revocation certificate given.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:451
+#: src/revocation/gnunet-revocation.c:471
 #, c-format
 msgid "Failed to read revocation certificate from `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:471
+#: src/revocation/gnunet-revocation.c:493
 msgid "No action specified. Nothing to do.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:490
+#: src/revocation/gnunet-revocation.c:512
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:498
+#: src/revocation/gnunet-revocation.c:520
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:505
+#: src/revocation/gnunet-revocation.c:527
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:512
+#: src/revocation/gnunet-revocation.c:534
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:458
+#: src/revocation/gnunet-revocation.c:540
+#, fuzzy
+msgid "number of epochs to calculate for"
+msgstr "nombre de valeurs"
+
+#: src/revocation/gnunet-service-revocation.c:454
 msgid "# unsupported revocations received via set union"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:468
+#: src/revocation/gnunet-service-revocation.c:464
 msgid "# revocation messages received via set union"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:474
+#: src/revocation/gnunet-service-revocation.c:470
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:478
+#: src/revocation/gnunet-service-revocation.c:474
 msgid "# revocation set unions failed"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:490
+#: src/revocation/gnunet-service-revocation.c:486
 msgid "# revocation set unions completed"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:530
+#: src/revocation/gnunet-service-revocation.c:526
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:871
+#: src/revocation/gnunet-service-revocation.c:881
 msgid "Could not open revocation database file!"
 msgstr ""
 
+#: src/rps/gnunet-rps.c:270
+msgid "Seed a PeerID"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:275
+msgid "Get updates of view (0 for infinite updates)"
+msgstr ""
+
+#: src/rps/gnunet-rps.c:279
+msgid "Get peers from biased stream"
+msgstr ""
+
 #: src/rps/gnunet-rps-profiler.c:3200
 msgid "duration of the profiling"
 msgstr ""
@@ -5947,18 +6001,6 @@ msgstr "nombre de valeurs"
 msgid "Measure quality and performance of the RPS service."
 msgstr ""
 
-#: src/rps/gnunet-rps.c:270
-msgid "Seed a PeerID"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:275
-msgid "Get updates of view (0 for infinite updates)"
-msgstr ""
-
-#: src/rps/gnunet-rps.c:279
-msgid "Get peers from biased stream"
-msgstr ""
-
 #: src/scalarproduct/gnunet-scalarproduct.c:229
 msgid "You must specify at least one message ID to check!\n"
 msgstr ""
@@ -6013,10 +6055,10 @@ msgstr ""
 msgid "Calculate the Vectorproduct with a GNUnet peer."
 msgstr ""
 
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1127
-#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1073
 #: src/scalarproduct/gnunet-service-scalarproduct_alice.c:1363
 #: src/scalarproduct/gnunet-service-scalarproduct_bob.c:1366
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_alice.c:1127
+#: src/scalarproduct/gnunet-service-scalarproduct-ecc_bob.c:1073
 msgid "Connect to CADET failed\n"
 msgstr ""
 
@@ -6109,92 +6151,92 @@ msgstr ""
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:409
-#: src/statistics/gnunet-statistics.c:448
+#: src/statistics/gnunet-statistics.c:413
+#: src/statistics/gnunet-statistics.c:455
 msgid "Failed to obtain statistics.\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:412
-#: src/statistics/gnunet-statistics.c:451
+#: src/statistics/gnunet-statistics.c:416
+#: src/statistics/gnunet-statistics.c:458
 #, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:526
+#: src/statistics/gnunet-statistics.c:532
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:532
+#: src/statistics/gnunet-statistics.c:538
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:571
+#: src/statistics/gnunet-statistics.c:577
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:583
+#: src/statistics/gnunet-statistics.c:589
 #, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:710
+#: src/statistics/gnunet-statistics.c:725
 #, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Argument invalide « %s »\n"
 
-#: src/statistics/gnunet-statistics.c:726
+#: src/statistics/gnunet-statistics.c:742
 #, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:735
+#: src/statistics/gnunet-statistics.c:751
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:764
+#: src/statistics/gnunet-statistics.c:783
 #, c-format
 msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:797
+#: src/statistics/gnunet-statistics.c:816
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:803
+#: src/statistics/gnunet-statistics.c:821
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:810
+#: src/statistics/gnunet-statistics.c:827
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:816
+#: src/statistics/gnunet-statistics.c:832
 msgid "use as csv separator"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:823
+#: src/statistics/gnunet-statistics.c:838
 msgid "path to the folder containing the testbed data"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:829
+#: src/statistics/gnunet-statistics.c:843
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:834
+#: src/statistics/gnunet-statistics.c:847
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:840
+#: src/statistics/gnunet-statistics.c:852
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:846
+#: src/statistics/gnunet-statistics.c:857
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:861
+#: src/statistics/gnunet-statistics.c:874
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
@@ -6284,7 +6326,7 @@ msgid ""
 msgstr ""
 
 #: src/testbed/gnunet-daemon-testbed-underlay.c:234 src/testing/list-keys.c:47
-#: src/testing/testing.c:284 src/util/gnunet-ecc.c:292
+#: src/testing/testing.c:284 src/util/gnunet-ecc.c:318
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
@@ -6354,6 +6396,15 @@ msgstr ""
 msgid "%.s Unknown result code."
 msgstr "%.s Code d'erreur inconnu"
 
+#: src/testbed/gnunet_testbed_mpi_spawn.c:119
+msgid "Waiting for child to exit.\n"
+msgstr ""
+
+#: src/testbed/gnunet_testbed_mpi_spawn.c:242
+#, c-format
+msgid "Spawning process `%s'\n"
+msgstr ""
+
 #: src/testbed/gnunet-testbed-profiler.c:290
 msgid "tolerate COUNT number of continious timeout failures"
 msgstr ""
@@ -6365,15 +6416,6 @@ msgid ""
 "signal is received"
 msgstr ""
 
-#: src/testbed/gnunet_testbed_mpi_spawn.c:119
-msgid "Waiting for child to exit.\n"
-msgstr ""
-
-#: src/testbed/gnunet_testbed_mpi_spawn.c:242
-#, c-format
-msgid "Spawning process `%s'\n"
-msgstr ""
-
 #: src/testbed/testbed_api.c:399
 #, c-format
 msgid "Adding host %u failed with error: %s\n"
@@ -6661,84 +6703,84 @@ msgstr ""
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:2227
-#: src/transport/gnunet-communicator-udp.c:2712
-#: src/transport/gnunet-service-tng.c:10024
-#: src/transport/gnunet-service-transport.c:2627
+#: src/transport/gnunet-communicator-tcp.c:2458
+#: src/transport/gnunet-communicator-udp.c:2825
+#: src/transport/gnunet-service-tng.c:10027
+#: src/transport/gnunet-service-transport.c:2624
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:2285
+#: src/transport/gnunet-communicator-tcp.c:2754
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:2784
+#: src/transport/gnunet-communicator-udp.c:2897
 msgid "GNUnet UDP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:782
+#: src/transport/gnunet-communicator-unix.c:788
 msgid ""
 "Maximum number of UNIX connections exceeded, dropping incoming message\n"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:1009
+#: src/transport/gnunet-communicator-unix.c:1015
 msgid "UNIX communicator is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:1054
+#: src/transport/gnunet-communicator-unix.c:1060
 #: src/transport/plugin_transport_unix.c:1383
 #, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:1132
+#: src/transport/gnunet-communicator-unix.c:1138
 msgid "GNUnet UNIX domain socket communicator"
 msgstr ""
 
+#: src/transport/gnunet-service-transport_ats.c:137
+msgid "# Addresses given to ATS"
+msgstr ""
+
 #: src/transport/gnunet-service-transport.c:445
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:791
+#: src/transport/gnunet-service-transport.c:794
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1474
+#: src/transport/gnunet-service-transport.c:1477
 msgid "# bytes payload discarded due to not connected peer"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1619
+#: src/transport/gnunet-service-transport.c:1622
 msgid "# bytes total received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1709
+#: src/transport/gnunet-service-transport.c:1712
 msgid "# bytes payload received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2013
-#: src/transport/gnunet-service-transport.c:2452
+#: src/transport/gnunet-service-transport.c:2016
+#: src/transport/gnunet-service-transport.c:2450
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2456
+#: src/transport/gnunet-service-transport.c:2454
 #, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2551
+#: src/transport/gnunet-service-transport.c:2549
 #, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2560
+#: src/transport/gnunet-service-transport.c:2558
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_ats.c:137
-msgid "# Addresses given to ATS"
-msgstr ""
-
 #: src/transport/gnunet-service-transport_hello.c:195
 msgid "# refreshed my HELLO"
 msgstr ""
@@ -6962,7 +7004,7 @@ msgstr ""
 #: src/transport/gnunet-service-transport_validation.c:489
 #: src/transport/gnunet-service-transport_validation.c:679
 #: src/transport/gnunet-service-transport_validation.c:1000
-#: src/transport/gnunet-service-transport_validation.c:1626
+#: src/transport/gnunet-service-transport_validation.c:1627
 msgid "# validations running"
 msgstr ""
 
@@ -7015,71 +7057,35 @@ msgid ""
 "having this address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1278
+#: src/transport/gnunet-service-transport_validation.c:1279
 #, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1330
+#: src/transport/gnunet-service-transport_validation.c:1331
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1339
+#: src/transport/gnunet-service-transport_validation.c:1340
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1514
+#: src/transport/gnunet-service-transport_validation.c:1515
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1532
+#: src/transport/gnunet-service-transport_validation.c:1533
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1589
+#: src/transport/gnunet-service-transport_validation.c:1590
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1644
+#: src/transport/gnunet-service-transport_validation.c:1645
 msgid "# HELLOs given to peerinfo"
 msgstr ""
 
-#: src/transport/gnunet-transport-profiler.c:220
-#, c-format
-msgid "%llu B in %llu ms == %.2f KB/s!\n"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:577
-msgid "send data to peer"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:581
-msgid "receive data from peer"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:586
-msgid "iterations"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:591
-#, fuzzy
-msgid "number of messages to send"
-msgstr "nombre de valeurs"
-
-#: src/transport/gnunet-transport-profiler.c:596
-msgid "message size to use"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:601
-#: src/transport/gnunet-transport.c:1404
-msgid "peer identity"
-msgstr ""
-
-#: src/transport/gnunet-transport-profiler.c:614
-#: src/transport/gnunet-transport.c:1426
-msgid "Direct access to transport service."
-msgstr ""
-
 #: src/transport/gnunet-transport.c:406
 #, c-format
 msgid "Transmitted %llu bytes/s (%llu bytes in %s)\n"
@@ -7209,6 +7215,11 @@ msgstr ""
 msgid "do not resolve hostnames"
 msgstr ""
 
+#: src/transport/gnunet-transport.c:1404
+#: src/transport/gnunet-transport-profiler.c:601
+msgid "peer identity"
+msgstr ""
+
 #: src/transport/gnunet-transport.c:1408
 msgid "monitor plugin sessions"
 msgstr ""
@@ -7217,6 +7228,37 @@ msgstr ""
 msgid "send data for benchmarking to the other peer (until CTRL-C)"
 msgstr ""
 
+#: src/transport/gnunet-transport.c:1426
+#: src/transport/gnunet-transport-profiler.c:614
+msgid "Direct access to transport service."
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:220
+#, c-format
+msgid "%llu B in %llu ms == %.2f KB/s!\n"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:577
+msgid "send data to peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:581
+msgid "receive data from peer"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:586
+msgid "iterations"
+msgstr ""
+
+#: src/transport/gnunet-transport-profiler.c:591
+#, fuzzy
+msgid "number of messages to send"
+msgstr "nombre de valeurs"
+
+#: src/transport/gnunet-transport-profiler.c:596
+msgid "message size to use"
+msgstr ""
+
 #: src/transport/plugin_transport_http_client.c:1489
 #: src/transport/plugin_transport_http_server.c:2331
 #: src/transport/plugin_transport_http_server.c:3562
@@ -7482,6 +7524,20 @@ msgstr ""
 msgid "TCP transport advertises itself as being on port %llu\n"
 msgstr ""
 
+#: src/transport/plugin_transport_udp_broadcasting.c:169
+msgid "# Multicast HELLO beacons received via UDP"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:553
+msgid ""
+"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
+msgstr ""
+
+#: src/transport/plugin_transport_udp_broadcasting.c:571
+#, c-format
+msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
+msgstr ""
+
 #: src/transport/plugin_transport_udp.c:3169
 #, c-format
 msgid ""
@@ -7528,20 +7584,6 @@ msgstr "adresse invalide"
 msgid "Failed to create UDP network sockets\n"
 msgstr ""
 
-#: src/transport/plugin_transport_udp_broadcasting.c:169
-msgid "# Multicast HELLO beacons received via UDP"
-msgstr ""
-
-#: src/transport/plugin_transport_udp_broadcasting.c:553
-msgid ""
-"Disabling HELLO broadcasting due to friend-to-friend only configuration!\n"
-msgstr ""
-
-#: src/transport/plugin_transport_udp_broadcasting.c:571
-#, c-format
-msgid "Failed to set IPv4 broadcast option for broadcast socket on port %d\n"
-msgstr ""
-
 #: src/transport/plugin_transport_unix.c:1396
 #, c-format
 msgid "Cannot bind to `%s'\n"
@@ -7619,17 +7661,17 @@ msgstr ""
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1400
+#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1396
 #, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1412
+#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1408
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1419
+#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1415
 #, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr ""
@@ -7641,7 +7683,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:345 src/util/service.c:837
+#: src/transport/tcp_service_legacy.c:345 src/util/service.c:833
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
@@ -7651,23 +7693,23 @@ msgstr ""
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:410 src/util/service.c:950
+#: src/transport/tcp_service_legacy.c:410 src/util/service.c:946
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:451 src/util/service.c:991
+#: src/transport/tcp_service_legacy.c:451 src/util/service.c:987
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:890
-#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1480
+#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1476
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1504
+#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1500
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -7682,45 +7724,45 @@ msgstr ""
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1750
+#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1746
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1755
+#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1751
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1760
+#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1756
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1253 src/util/disk.c:1177
-#: src/util/service.c:1641
+#: src/transport/tcp_service_legacy.c:1253 src/util/disk.c:1176
+#: src/util/service.c:1637
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1643
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1639
 msgid "No such user"
 msgstr "Aucun utilisateur trouvé"
 
-#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1657
+#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1653
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1348 src/util/service.c:1999
+#: src/transport/tcp_service_legacy.c:1348 src/util/service.c:1996
 msgid "do daemonize (detach from terminal)"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:1397
-#: src/transport/transport-testing2.c:906 src/util/service.c:2073
-#: src/util/service.c:2085
+#: src/transport/transport-testing2.c:1061 src/util/service.c:2072
+#: src/util/service.c:2084
 #, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2095
+#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2094
 msgid "Malformed configuration, exit ...\n"
 msgstr ""
 
@@ -7729,137 +7771,187 @@ msgstr ""
 msgid "Could not access configuration file `%s'\n"
 msgstr ""
 
-#: src/transport/transport_api2_communication.c:704
+#: src/transport/transport_api2_communication.c:743
 msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/util/bio.c:177 src/util/bio.c:185
-#, c-format
-msgid "Error reading `%s': %s"
+#: src/util/bio.c:227 src/util/bio.c:235
+#, fuzzy, c-format
+msgid "Error reading `%s' from file: %s"
 msgstr "Erreur de lecture : « %s » : %s"
 
-#: src/util/bio.c:187
+#: src/util/bio.c:237
 msgid "End of file"
 msgstr "Fin de fichier"
 
-#: src/util/bio.c:244
+#: src/util/bio.c:266
+#, fuzzy, c-format
+msgid "Error while reading `%s' from buffer: %s"
+msgstr "Erreur de lecture : « %s » : %s"
+
+#: src/util/bio.c:268
+msgid "Not enough data left"
+msgstr ""
+
+#: src/util/bio.c:308
+#, c-format
+msgid "Invalid handle type while reading `%s'"
+msgstr ""
+
+#: src/util/bio.c:335 src/util/bio.c:838
+msgid "string length"
+msgstr ""
+
+#: src/util/bio.c:341
+#, fuzzy, c-format
+msgid "%s (while reading `%s')"
+msgstr "Erreur de lecture : « %s » : %s"
+
+#: src/util/bio.c:346
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:255
+#: src/util/bio.c:359
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:303
+#: src/util/bio.c:398 src/util/bio.c:863 src/util/bio.c:880
+msgid "metadata length"
+msgstr ""
+
+#: src/util/bio.c:410
 #, c-format
-msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
+msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:319
+#: src/util/bio.c:426
+#, fuzzy, c-format
+msgid "Failed to deserialize metadata `%s'"
+msgstr "Résolution de « %s » échouée\n"
+
+#: src/util/bio.c:667
+msgid "Unable to flush buffer to file"
+msgstr ""
+
+#: src/util/bio.c:729 src/util/bio.c:750
+#, fuzzy, c-format
+msgid "Error while writing `%s' to file: %s"
+msgstr "Erreur de lecture : « %s » : %s"
+
+#: src/util/bio.c:731
+msgid "No associated file"
+msgstr ""
+
+#: src/util/bio.c:815
 #, c-format
-msgid "Metadata `%s' failed to deserialize"
+msgid "Invalid handle type while writing `%s'"
 msgstr ""
 
-#: src/util/client.c:739 src/util/client.c:931
+#: src/util/bio.c:875
+#, fuzzy, c-format
+msgid "Failed to serialize metadata `%s'"
+msgstr "Échec du démarrage de %s\n"
+
+#: src/util/client.c:747 src/util/client.c:937
 msgid "not a valid filename"
 msgstr ""
 
-#: src/util/client.c:1097
+#: src/util/client.c:1103
 #, c-format
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:259 src/util/common_logging.c:1116
+#: src/util/common_logging.c:259 src/util/common_logging.c:1114
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/common_logging.c:261 src/util/common_logging.c:1114
+#: src/util/common_logging.c:261 src/util/common_logging.c:1112
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:263 src/util/common_logging.c:1112
+#: src/util/common_logging.c:263 src/util/common_logging.c:1110
 msgid "MESSAGE"
 msgstr ""
 
-#: src/util/common_logging.c:265 src/util/common_logging.c:1110
+#: src/util/common_logging.c:265 src/util/common_logging.c:1108
 msgid "WARNING"
 msgstr "AVERTISSEMENT"
 
-#: src/util/common_logging.c:267 src/util/common_logging.c:1108
+#: src/util/common_logging.c:267 src/util/common_logging.c:1106
 msgid "ERROR"
 msgstr "ERREUR"
 
-#: src/util/common_logging.c:269 src/util/common_logging.c:1118
+#: src/util/common_logging.c:269 src/util/common_logging.c:1116
 msgid "NONE"
 msgstr "AUCUN"
 
-#: src/util/common_logging.c:630 src/util/common_logging.c:669
+#: src/util/common_logging.c:626 src/util/common_logging.c:665
 #, c-format
 msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:906
+#: src/util/common_logging.c:904
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1119
+#: src/util/common_logging.c:1117
 msgid "INVALID"
 msgstr "INVALIDE"
 
-#: src/util/common_logging.c:1400
+#: src/util/common_logging.c:1398
 msgid "unknown address"
 msgstr "adresse inconnue"
 
-#: src/util/common_logging.c:1445
+#: src/util/common_logging.c:1443
 msgid "invalid address"
 msgstr "adresse invalide"
 
-#: src/util/common_logging.c:1464
+#: src/util/common_logging.c:1462
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 
-#: src/util/common_logging.c:1487
+#: src/util/common_logging.c:1485
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
 msgstr ""
 
-#: src/util/configuration.c:325
+#: src/util/configuration.c:402
 #, c-format
 msgid "Syntax error while deserializing in line %u\n"
 msgstr ""
 
-#: src/util/configuration.c:383
+#: src/util/configuration.c:460
 #, fuzzy, c-format
 msgid "Error while reading file `%s'\n"
 msgstr "Erreur de lecture : « %s » : %s"
 
-#: src/util/configuration.c:986
+#: src/util/configuration.c:1063
 msgid "Not a valid relative time specification"
 msgstr ""
 
-#: src/util/configuration.c:1077
+#: src/util/configuration.c:1154
 #, c-format
 msgid ""
 "Configuration value '%s' for '%s' in section '%s' is not in set of legal "
 "choices\n"
 msgstr ""
 
-#: src/util/configuration.c:1192
+#: src/util/configuration.c:1269
 #, c-format
 msgid "Recursive expansion suspected, aborting $-expansion for term `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1224
+#: src/util/configuration.c:1301
 #, c-format
 msgid "Missing closing `%s' in option `%s'\n"
 msgstr ""
 
-#: src/util/configuration.c:1290
+#: src/util/configuration.c:1367
 #, c-format
 msgid ""
 "Failed to expand `%s' in `%s' as it is neither found in [PATHS] nor defined "
@@ -7873,41 +7965,17 @@ msgid ""
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:705
+#: src/util/crypto_ecc.c:663
 #, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:822
+#: src/util/crypto_ecc.c:791
 #, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:136 src/util/crypto_ecc_setup.c:178
-#: src/util/crypto_ecc_setup.c:318 src/util/crypto_ecc_setup.c:360
-#, c-format
-msgid "Could not acquire lock on file `%s': %s...\n"
-msgstr ""
-
-#: src/util/crypto_ecc_setup.c:142 src/util/crypto_ecc_setup.c:324
-msgid "Creating a new private key.  This may take a while.\n"
-msgstr ""
-
-#: src/util/crypto_ecc_setup.c:184 src/util/crypto_ecc_setup.c:366
-msgid "This may be ok if someone is currently generating a private key.\n"
-msgstr ""
-
-#: src/util/crypto_ecc_setup.c:220 src/util/crypto_ecc_setup.c:402
-#, c-format
-msgid ""
-"When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
-msgstr ""
-
-#: src/util/crypto_ecc_setup.c:225 src/util/crypto_ecc_setup.c:407
-msgid "This may be ok if someone is currently generating a key.\n"
-msgstr ""
-
-#: src/util/crypto_ecc_setup.c:469
+#: src/util/crypto_ecc_setup.c:369
 msgid "Could not load peer's private key\n"
 msgstr ""
 
@@ -7916,17 +7984,17 @@ msgstr ""
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:956
+#: src/util/crypto_rsa.c:959
 #, c-format
 msgid "RSA signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:1313
+#: src/util/crypto_rsa.c:1318
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/disk.c:941
+#: src/util/disk.c:940
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr ""
@@ -8026,64 +8094,83 @@ msgstr ""
 msgid "Missing mandatory option `%s'.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:68
+#: src/util/getopt_helpers.c:69
 msgid "print the version number"
 msgstr ""
 
-#: src/util/getopt_helpers.c:114
+#: src/util/getopt_helpers.c:116
 #, c-format
 msgid ""
 "Arguments mandatory for long options are also mandatory for short options.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:205
+#: src/util/getopt_helpers.c:208
 msgid "print this help"
 msgstr ""
 
-#: src/util/getopt_helpers.c:281
+#: src/util/getopt_helpers.c:288
 msgid "be verbose"
 msgstr ""
 
-#: src/util/getopt_helpers.c:417
+#: src/util/getopt_helpers.c:429
 msgid "configure logging to use LOGLEVEL"
 msgstr ""
 
-#: src/util/getopt_helpers.c:495
+#: src/util/getopt_helpers.c:510
 msgid "configure logging to write logs to FILENAME"
 msgstr ""
 
-#: src/util/getopt_helpers.c:516
+#: src/util/getopt_helpers.c:532
 #, fuzzy
 msgid "use configuration file FILENAME"
 msgstr "fornat invalide : « %s »\n"
 
-#: src/util/getopt_helpers.c:551 src/util/getopt_helpers.c:747
-#: src/util/getopt_helpers.c:810
+#: src/util/getopt_helpers.c:568 src/util/getopt_helpers.c:859
+#: src/util/getopt_helpers.c:924
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:612
+#: src/util/getopt_helpers.c:649
+#, c-format
+msgid ""
+"You must pass a relative time (optionally with sign) to the `%s' option.\n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:656
+#, c-format
+msgid "Value given for time travel `%s' option is too big.\n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:683
+msgid "[+/-]MICROSECONDS"
+msgstr ""
+
+#: src/util/getopt_helpers.c:685
+msgid "modify system time by given offset (for debugging/testing only)"
+msgstr ""
+
+#: src/util/getopt_helpers.c:720
 #, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:675
+#: src/util/getopt_helpers.c:785
 #, c-format
 msgid "You must pass absolute time to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:740
+#: src/util/getopt_helpers.c:852
 #, c-format
-msgid "Your input for the '%s' option has to be a non negative number \n"
+msgid "Your input for the '%s' option has to be a non negative number\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:817
+#: src/util/getopt_helpers.c:931
 #, c-format
 msgid "You must pass a number below %u to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:902
+#: src/util/getopt_helpers.c:1018
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
@@ -8155,7 +8242,7 @@ msgstr ""
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:175
+#: src/util/gnunet-ecc.c:177
 #, c-format
 msgid ""
 "\n"
@@ -8178,54 +8265,54 @@ msgid ""
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:277
+#: src/util/gnunet-ecc.c:303
 #, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:287
+#: src/util/gnunet-ecc.c:313
 #, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:307
+#: src/util/gnunet-ecc.c:333
 #, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:361
+#: src/util/gnunet-ecc.c:387
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:425
+#: src/util/gnunet-ecc.c:451
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:431
+#: src/util/gnunet-ecc.c:457
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:437
+#: src/util/gnunet-ecc.c:463
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:442
+#: src/util/gnunet-ecc.c:468
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:447
+#: src/util/gnunet-ecc.c:473
 msgid "print the private key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:452
+#: src/util/gnunet-ecc.c:478
 msgid "print the public key in HEX format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:458
+#: src/util/gnunet-ecc.c:484
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:472
+#: src/util/gnunet-ecc.c:498
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
@@ -8260,32 +8347,32 @@ msgstr ""
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:179
+#: src/util/gnunet-resolver.c:182
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:219
+#: src/util/gnunet-scrypt.c:222
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:285
+#: src/util/gnunet-scrypt.c:288
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:291
+#: src/util/gnunet-scrypt.c:294
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:297
+#: src/util/gnunet-scrypt.c:300
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:303
+#: src/util/gnunet-scrypt.c:306
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:316
+#: src/util/gnunet-scrypt.c:319
 msgid "Manipulate GNUnet proof of work files"
 msgstr ""
 
@@ -8328,19 +8415,19 @@ msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:408
+#: src/util/os_installation.c:409
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:791
+#: src/util/os_installation.c:792
 #, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr ""
 
-#: src/util/os_installation.c:824
+#: src/util/os_installation.c:825
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
@@ -8417,14 +8504,14 @@ msgstr ""
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "Résolution de « %s » échouée : %s\n"
 
-#: src/util/service.c:657
+#: src/util/service.c:653
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
-#: src/util/service.c:1572
+#: src/util/service.c:1568
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
@@ -8439,116 +8526,116 @@ msgstr ""
 msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
 
-#: src/util/strings.c:177
+#: src/util/strings.c:178
 msgid "b"
 msgstr "o"
 
-#: src/util/strings.c:498
+#: src/util/strings.c:502
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:622
+#: src/util/strings.c:636
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:691
+#: src/util/strings.c:705
 msgid "µs"
 msgstr "µs"
 
-#: src/util/strings.c:695
+#: src/util/strings.c:709
 msgid "forever"
 msgstr "perpetuel"
 
-#: src/util/strings.c:697
+#: src/util/strings.c:711
 msgid "0 ms"
 msgstr "0 ms"
 
-#: src/util/strings.c:701
+#: src/util/strings.c:715
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:705
+#: src/util/strings.c:719
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:709
+#: src/util/strings.c:723
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:713
+#: src/util/strings.c:727
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:719
+#: src/util/strings.c:733
 msgid "day"
 msgstr "jour"
 
-#: src/util/strings.c:721
+#: src/util/strings.c:735
 msgid "days"
 msgstr "jours"
 
-#: src/util/strings.c:749
+#: src/util/strings.c:763
 msgid "end of time"
 msgstr "fin du temps"
 
-#: src/util/strings.c:1219
+#: src/util/strings.c:1239
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1227
+#: src/util/strings.c:1247
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1234
+#: src/util/strings.c:1254
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1242
+#: src/util/strings.c:1262
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1251
+#: src/util/strings.c:1271
 #, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr ""
 
-#: src/util/strings.c:1479 src/util/strings.c:1490
+#: src/util/strings.c:1498 src/util/strings.c:1509
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1499
+#: src/util/strings.c:1518
 #, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1582 src/util/strings.c:1611 src/util/strings.c:1658
-#: src/util/strings.c:1678
+#: src/util/strings.c:1601 src/util/strings.c:1630 src/util/strings.c:1677
+#: src/util/strings.c:1697
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1636
+#: src/util/strings.c:1655
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr ""
 
-#: src/util/strings.c:1687
+#: src/util/strings.c:1706
 #, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "fornat invalide : « %s »\n"
 
-#: src/util/strings.c:1740
+#: src/util/strings.c:1759
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr ""
 
-#: src/util/strings.c:1790
+#: src/util/strings.c:1809
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr ""
 
-#: src/util/strings.c:1821
+#: src/util/strings.c:1840
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr ""
@@ -8728,8 +8815,8 @@ msgstr ""
 msgid "Setup tunnels via VPN."
 msgstr "Configurer des tunnels via VPN."
 
-#: src/zonemaster/gnunet-service-zonemaster-monitor.c:420
 #: src/zonemaster/gnunet-service-zonemaster.c:849
+#: src/zonemaster/gnunet-service-zonemaster-monitor.c:420
 msgid "Failed to connect to the namestore!\n"
 msgstr ""
 
diff --git a/po/it.po b/po/it.po
index 986bc8b64..92b63e39c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.10.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2020-02-13 20:41+0100\n"
+"POT-Creation-Date: 2020-07-07 12:22+0200\n"
 "PO-Revision-Date: 2019-10-16 11:00+0200\n"
 "Last-Translator: Sebastiano Pistore <sebastianopistore.info@protonmail.ch>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -20,123 +20,123 @@ msgstr ""
 "X-Generator: Poedit 2.2.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/abd/gnunet-abd.c:397 src/namestore/gnunet-namestore.c:1271
+#: src/abd/gnunet-abd.c:397 src/namestore/gnunet-namestore.c:1302
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:413 src/abd/gnunet-abd.c:886
+#: src/abd/gnunet-abd.c:413 src/abd/gnunet-abd.c:896
 #, c-format
 msgid "Issuer public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1747
+#: src/abd/gnunet-abd.c:560 src/abd/gnunet-service-abd.c:1747
 #: src/namestore/gnunet-namestore.c:1001
-#: src/namestore/gnunet-namestore-fcfsd.c:1153
+#: src/namestore/gnunet-namestore-fcfsd.c:1154
 #, c-format
 msgid "Failed to connect to namestore\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:825 src/abd/gnunet-abd.c:876
+#: src/abd/gnunet-abd.c:835 src/abd/gnunet-abd.c:886
 #, c-format
 msgid "Issuer public key not well-formed\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:834 src/abd/gnunet-abd.c:895
+#: src/abd/gnunet-abd.c:844 src/abd/gnunet-abd.c:905
 #, fuzzy, c-format
 msgid "Failed to connect to ABD\n"
 msgstr "Impossibile avviare il servizio.\n"
 
-#: src/abd/gnunet-abd.c:840
+#: src/abd/gnunet-abd.c:850
 #, c-format
 msgid "You must provide issuer the attribute\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:847
+#: src/abd/gnunet-abd.c:857
 #, c-format
 msgid "ego required\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:857
+#: src/abd/gnunet-abd.c:867
 #, c-format
 msgid "Subject public key needed\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:866
+#: src/abd/gnunet-abd.c:876
 #, c-format
 msgid "Subject public key `%s' is not well-formed\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:901
+#: src/abd/gnunet-abd.c:911
 #, c-format
 msgid "You must provide issuer and subject attributes\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:957
+#: src/abd/gnunet-abd.c:970
 #, c-format
 msgid "Please specify name to lookup, subject key and issuer key!\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:978
+#: src/abd/gnunet-abd.c:991
 msgid "verify credential against attribute"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:985
+#: src/abd/gnunet-abd.c:998
 msgid ""
 "The public key of the subject to lookup thecredential for, or for issuer "
 "side storage: subject and its attributes"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:992
+#: src/abd/gnunet-abd.c:1005
 msgid "The private, signed delegate presented by the subject"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:999
+#: src/abd/gnunet-abd.c:1012
 msgid "The public key of the authority to verify the credential against"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1004
+#: src/abd/gnunet-abd.c:1017
 msgid "The ego/zone name to use"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1010
+#: src/abd/gnunet-abd.c:1023
 msgid "The issuer attribute to verify against or to issue"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1016
+#: src/abd/gnunet-abd.c:1029
 msgid ""
 "The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1021
+#: src/abd/gnunet-abd.c:1034
 msgid "collect credentials"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1026
+#: src/abd/gnunet-abd.c:1039
 msgid "Create and issue a credential issuer side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1031
+#: src/abd/gnunet-abd.c:1044
 msgid "Issue a credential subject side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1036
+#: src/abd/gnunet-abd.c:1049
 msgid "Create, sign and return a credential subject side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1043
+#: src/abd/gnunet-abd.c:1056
 msgid "Import signed credentials that should be issued to a zone/ego"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1047
+#: src/abd/gnunet-abd.c:1060
 msgid "Create private record entry."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1053 src/abd/gnunet-abd.c:1059
+#: src/abd/gnunet-abd.c:1066 src/abd/gnunet-abd.c:1072
 msgid "Indicates that the collect/verify process is done via forward search."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1072
+#: src/abd/gnunet-abd.c:1085
 msgid "GNUnet abd resolver tool"
 msgstr ""
 
@@ -376,28 +376,28 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:1129
 #: src/transport/plugin_transport_tcp.c:3706
 #: src/transport/tcp_service_legacy.c:594
-#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1091
-#: src/util/service.c:1097
+#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1090
+#: src/util/service.c:1096
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:452 src/transport/plugin_transport_tcp.c:1163
 #: src/transport/tcp_service_legacy.c:634 src/util/client.c:527
-#: src/util/service.c:1130
+#: src/util/service.c:1129
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:456 src/transport/plugin_transport_tcp.c:1167
 #: src/transport/tcp_service_legacy.c:638 src/util/client.c:532
-#: src/util/service.c:1134
+#: src/util/service.c:1133
 #, c-format
 msgid "Using `%s' instead\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:484 src/transport/plugin_transport_tcp.c:1195
-#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1154
+#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1153
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -405,7 +405,7 @@ msgid ""
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:505 src/transport/plugin_transport_tcp.c:1213
-#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1172
+#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1171
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
@@ -413,7 +413,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:536
 #: src/transport/plugin_transport_http_server.c:2718
 #: src/transport/plugin_transport_tcp.c:1244
-#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1203
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1202
 #, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr ""
@@ -421,7 +421,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:555
 #: src/transport/plugin_transport_http_server.c:2736
 #: src/transport/plugin_transport_tcp.c:1263
-#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1222
+#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1221
 #, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr ""
@@ -558,12 +558,12 @@ msgstr ""
 msgid "Failed to initialize solver `%s'!\n"
 msgstr ""
 
-#: src/ats/plugin_ats_proportional.c:1140
+#: src/ats/plugin_ats_proportional.c:1142
 #, c-format
 msgid "Invalid %s configuration %f \n"
 msgstr ""
 
-#: src/ats/plugin_ats_proportional.c:1163
+#: src/ats/plugin_ats_proportional.c:1165
 #, c-format
 msgid "Invalid %s configuration %f\n"
 msgstr ""
@@ -747,7 +747,7 @@ msgstr ""
 
 #: src/auction/gnunet-auction-info.c:77 src/auction/gnunet-auction-join.c:77
 #: src/conversation/gnunet-conversation-test.c:256
-#: src/revocation/gnunet-revocation.c:524 src/template/gnunet-template.c:75
+#: src/revocation/gnunet-revocation.c:552 src/template/gnunet-template.c:75
 msgid "help text"
 msgstr ""
 
@@ -1342,11 +1342,11 @@ msgstr ""
 msgid "# messages of type %u discarded (client busy)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:926
+#: src/core/gnunet-service-core.c:927
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:945
+#: src/core/gnunet-service-core.c:955
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "Avvio del servizio '%s' in corso\n"
@@ -1375,115 +1375,115 @@ msgstr ""
 msgid "# PING messages transmitted"
 msgstr "# Messaggi PING trasmessi"
 
-#: src/core/gnunet-service-core_kx.c:978
+#: src/core/gnunet-service-core_kx.c:979
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:992
+#: src/core/gnunet-service-core_kx.c:993
 #, fuzzy
 msgid "# duplicate ephemeral keys ignored"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/core/gnunet-service-core_kx.c:1027
+#: src/core/gnunet-service-core_kx.c:1028
 #, fuzzy
 msgid "# EPHEMERAL_KEYs rejected (bad signature)"
 msgstr "# messaggi SYN ricevuti"
 
-#: src/core/gnunet-service-core_kx.c:1045
+#: src/core/gnunet-service-core_kx.c:1046
 #, c-format
 msgid ""
 "EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match "
 "our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1052
+#: src/core/gnunet-service-core_kx.c:1053
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages rejected due to time"
 msgstr "# messaggi SYN ricevuti"
 
-#: src/core/gnunet-service-core_kx.c:1070
+#: src/core/gnunet-service-core_kx.c:1071
 #, fuzzy
 msgid "# valid ephemeral keys received"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/core/gnunet-service-core_kx.c:1179
+#: src/core/gnunet-service-core_kx.c:1180
 #: src/transport/gnunet-service-transport_validation.c:1133
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1189
+#: src/core/gnunet-service-core_kx.c:1190
 msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1238
+#: src/core/gnunet-service-core_kx.c:1239
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1263
+#: src/core/gnunet-service-core_kx.c:1264
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1276
+#: src/core/gnunet-service-core_kx.c:1277
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1333
-#: src/transport/gnunet-service-transport_validation.c:1475
+#: src/core/gnunet-service-core_kx.c:1334
+#: src/transport/gnunet-service-transport_validation.c:1476
 msgid "# PONG messages received"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/core/gnunet-service-core_kx.c:1341
+#: src/core/gnunet-service-core_kx.c:1342
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1349
+#: src/core/gnunet-service-core_kx.c:1350
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1388
+#: src/core/gnunet-service-core_kx.c:1389
 msgid "# PONG messages decrypted"
 msgstr "# messaggi PONG decrittati"
 
-#: src/core/gnunet-service-core_kx.c:1428
+#: src/core/gnunet-service-core_kx.c:1429
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1440
+#: src/core/gnunet-service-core_kx.c:1441
 msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1449
+#: src/core/gnunet-service-core_kx.c:1450
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1625
+#: src/core/gnunet-service-core_kx.c:1626
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1636
+#: src/core/gnunet-service-core_kx.c:1637
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1640
+#: src/core/gnunet-service-core_kx.c:1641
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1718
-#: src/core/gnunet-service-core_kx.c:1745
+#: src/core/gnunet-service-core_kx.c:1719
+#: src/core/gnunet-service-core_kx.c:1746
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1731
+#: src/core/gnunet-service-core_kx.c:1732
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1776
+#: src/core/gnunet-service-core_kx.c:1777
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1785
+#: src/core/gnunet-service-core_kx.c:1786
 msgid "# bytes of payload decrypted"
 msgstr ""
 
@@ -2647,56 +2647,56 @@ msgstr ""
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1141
+#: src/fs/fs_api.c:1173
 #, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1667
+#: src/fs/fs_api.c:1724
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1682
+#: src/fs/fs_api.c:1739
 #, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2366
+#: src/fs/fs_api.c:2468
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2377
+#: src/fs/fs_api.c:2479
 #, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2513 src/fs/fs_api.c:2759
+#: src/fs/fs_api.c:2627 src/fs/fs_api.c:2873
 #, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2531
+#: src/fs/fs_api.c:2645
 #, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2547 src/fs/fs_api.c:2567 src/fs/fs_api.c:3058
+#: src/fs/fs_api.c:2661 src/fs/fs_api.c:2681 src/fs/fs_api.c:3180
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2749
+#: src/fs/fs_api.c:2863
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3002
+#: src/fs/fs_api.c:3124
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3097
+#: src/fs/fs_api.c:3219
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2792,17 +2792,17 @@ msgstr ""
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:227
+#: src/fs/fs_namespace.c:233
 #, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:321
+#: src/fs/fs_namespace.c:330
 #, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_namespace.c:463
+#: src/fs/fs_namespace.c:472
 msgid "Failed to connect to datastore."
 msgstr ""
 
@@ -3013,67 +3013,67 @@ msgstr "argomento non valido"
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:1072 src/fs/fs_uri.c:1099
+#: src/fs/fs_uri.c:1071 src/fs/fs_uri.c:1098
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1105
+#: src/fs/fs_uri.c:1104
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:230
+#: src/fs/gnunet-auto-share.c:234
 #, c-format
 msgid "Failed to load state: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:278 src/fs/gnunet-auto-share.c:287
-#: src/fs/gnunet-auto-share.c:295
+#: src/fs/gnunet-auto-share.c:286 src/fs/gnunet-auto-share.c:295
+#: src/fs/gnunet-auto-share.c:303
 #, c-format
 msgid "Failed to save state to file %s\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:392
+#: src/fs/gnunet-auto-share.c:400
 #, c-format
 msgid "Publication of `%s' done\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:471
+#: src/fs/gnunet-auto-share.c:479
 #, c-format
 msgid "Publishing `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:483
+#: src/fs/gnunet-auto-share.c:491
 #, c-format
 msgid "Failed to run `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:653
+#: src/fs/gnunet-auto-share.c:661
 #, c-format
 msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:703 src/fs/gnunet-publish.c:888
+#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:888
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:710
+#: src/fs/gnunet-auto-share.c:718
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:716 src/fs/gnunet-publish.c:893
+#: src/fs/gnunet-auto-share.c:724 src/fs/gnunet-publish.c:893
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:723 src/fs/gnunet-publish.c:938
+#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:938
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:730 src/fs/gnunet-publish.c:951
+#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:951
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:753
+#: src/fs/gnunet-auto-share.c:761
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
@@ -3485,7 +3485,7 @@ msgstr ""
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs.c:1307 src/hostlist/gnunet-daemon-hostlist.c:355
+#: src/fs/gnunet-service-fs.c:1316 src/hostlist/gnunet-daemon-hostlist.c:343
 #: src/topology/gnunet-daemon-topology.c:1098
 #, c-format
 msgid "Failed to connect to `%s' service.\n"
@@ -3599,40 +3599,40 @@ msgid "# migration stop messages sent"
 msgstr ""
 
 #: src/fs/gnunet-service-fs_indexing.c:130
-#: src/fs/gnunet-service-fs_indexing.c:185
+#: src/fs/gnunet-service-fs_indexing.c:188
 #, c-format
 msgid "Could not open `%s'.\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:144
+#: src/fs/gnunet-service-fs_indexing.c:147
 #, c-format
 msgid "Error writing `%s'.\n"
 msgstr "Errore durante la scrittura di `%s'.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:241
+#: src/fs/gnunet-service-fs_indexing.c:244
 #, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:314
+#: src/fs/gnunet-service-fs_indexing.c:317
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:328
+#: src/fs/gnunet-service-fs_indexing.c:331
 #, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:332
+#: src/fs/gnunet-service-fs_indexing.c:335
 msgid "not indexed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:346
+#: src/fs/gnunet-service-fs_indexing.c:349
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:452
+#: src/fs/gnunet-service-fs_indexing.c:455
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3806,66 +3806,66 @@ msgstr ""
 msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:132
+#: src/gns/gnunet-bcd.c:133
 #, c-format
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:346
+#: src/gns/gnunet-bcd.c:347
 #, c-format
 msgid "Invalid port number %u.  Exiting.\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:351
+#: src/gns/gnunet-bcd.c:352
 #, c-format
 msgid "Businesscard HTTP server starts on %u\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:371
+#: src/gns/gnunet-bcd.c:372
 #, c-format
 msgid "Could not start businesscard HTTP server on port %u\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:508
+#: src/gns/gnunet-bcd.c:509
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:521
+#: src/gns/gnunet-bcd.c:522
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:213
+#: src/gns/gnunet-dns2gns.c:239
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:418
+#: src/gns/gnunet-dns2gns.c:442
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:434
+#: src/gns/gnunet-dns2gns.c:458
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:442
+#: src/gns/gnunet-dns2gns.c:466
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:603
+#: src/gns/gnunet-dns2gns.c:627
 msgid "No DNS server specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:752
+#: src/gns/gnunet-dns2gns.c:776
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:758
+#: src/gns/gnunet-dns2gns.c:782
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:775
+#: src/gns/gnunet-dns2gns.c:799
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -4003,43 +4003,43 @@ msgstr "Generazione statistiche fallita\n"
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:2922 src/rest/gnunet-rest-server.c:709
+#: src/gns/gnunet-gns-proxy.c:2922 src/rest/gnunet-rest-server.c:713
 msgid "Failed to pass client to MHD\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3268
+#: src/gns/gnunet-gns-proxy.c:3271
 #, c-format
 msgid "Unsupported socks version %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3300
+#: src/gns/gnunet-gns-proxy.c:3303
 #, c-format
 msgid "Unsupported socks command %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3386
+#: src/gns/gnunet-gns-proxy.c:3389
 #, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3727
+#: src/gns/gnunet-gns-proxy.c:3730
 #, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3861
+#: src/gns/gnunet-gns-proxy.c:3864
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3866
+#: src/gns/gnunet-gns-proxy.c:3869
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3870
+#: src/gns/gnunet-gns-proxy.c:3873
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3896
+#: src/gns/gnunet-gns-proxy.c:3899
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -4081,50 +4081,50 @@ msgstr ""
 msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:932
+#: src/gns/gnunet-service-gns_resolver.c:938
 msgid "Failed to parse DNS response\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1123
+#: src/gns/gnunet-service-gns_resolver.c:1129
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1439
+#: src/gns/gnunet-service-gns_resolver.c:1447
 #, c-format
 msgid "VPN returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1896
+#: src/gns/gnunet-service-gns_resolver.c:1909
 #, c-format
 msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1909
+#: src/gns/gnunet-service-gns_resolver.c:1922
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1952
+#: src/gns/gnunet-service-gns_resolver.c:1965
 #, c-format
 msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2372
+#: src/gns/gnunet-service-gns_resolver.c:2385
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2395
+#: src/gns/gnunet-service-gns_resolver.c:2408
 #, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2563
+#: src/gns/gnunet-service-gns_resolver.c:2576
 #, c-format
 msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2703
+#: src/gns/gnunet-service-gns_resolver.c:2716
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
@@ -4154,7 +4154,7 @@ msgstr ""
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
 
-#: src/gns/plugin_rest_gns.c:443
+#: src/gns/plugin_rest_gns.c:445
 msgid "Gns REST API initialized\n"
 msgstr ""
 
@@ -4299,31 +4299,31 @@ msgstr ""
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:316
+#: src/hostlist/gnunet-daemon-hostlist.c:306
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:377
+#: src/hostlist/gnunet-daemon-hostlist.c:364
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:383
+#: src/hostlist/gnunet-daemon-hostlist.c:369
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:388
+#: src/hostlist/gnunet-daemon-hostlist.c:374
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:393
+#: src/hostlist/gnunet-daemon-hostlist.c:378
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:409
+#: src/hostlist/gnunet-daemon-hostlist.c:393
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -4347,7 +4347,7 @@ msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:677
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1455
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1459
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -4398,7 +4398,7 @@ msgid "# hostlist downloads initiated"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1144
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1715
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1726
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
@@ -4427,65 +4427,65 @@ msgstr ""
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1448
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1452
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1451
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1455
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1502
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1506
 #, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1509
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1513
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1534
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1553
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1545
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1564
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1547
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1558
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1644
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1655
 #: src/transport/plugin_transport_http_client.c:2301
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1673
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1684
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1686
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1697
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1700
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1711
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:172
+#: src/hostlist/gnunet-daemon-hostlist_server.c:173
 msgid "bytes in hostlist"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:198
+#: src/hostlist/gnunet-daemon-hostlist_server.c:199
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:235
-#: src/hostlist/gnunet-daemon-hostlist_server.c:526
+#: src/hostlist/gnunet-daemon-hostlist_server.c:236
+#: src/hostlist/gnunet-daemon-hostlist_server.c:527
 #: src/peerinfo-tool/gnunet-peerinfo.c:379
 #: src/peerinfo-tool/gnunet-peerinfo.c:515
 #: src/topology/gnunet-daemon-topology.c:799
@@ -4493,194 +4493,199 @@ msgstr ""
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:256
+#: src/hostlist/gnunet-daemon-hostlist_server.c:257
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:274
+#: src/hostlist/gnunet-daemon-hostlist_server.c:275
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:376
+#: src/hostlist/gnunet-daemon-hostlist_server.c:377
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:380
+#: src/hostlist/gnunet-daemon-hostlist_server.c:381
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:393
+#: src/hostlist/gnunet-daemon-hostlist_server.c:394
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:398
+#: src/hostlist/gnunet-daemon-hostlist_server.c:399
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:408
+#: src/hostlist/gnunet-daemon-hostlist_server.c:409
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:411
+#: src/hostlist/gnunet-daemon-hostlist_server.c:412
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:417
+#: src/hostlist/gnunet-daemon-hostlist_server.c:418
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:419
+#: src/hostlist/gnunet-daemon-hostlist_server.c:420
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:460
+#: src/hostlist/gnunet-daemon-hostlist_server.c:461
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:673
-#: src/transport/gnunet-service-transport.c:2657
+#: src/hostlist/gnunet-daemon-hostlist_server.c:674
+#: src/transport/gnunet-service-transport.c:2659
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:684
+#: src/hostlist/gnunet-daemon-hostlist_server.c:685
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:696
+#: src/hostlist/gnunet-daemon-hostlist_server.c:697
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:713
+#: src/hostlist/gnunet-daemon-hostlist_server.c:714
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:728
+#: src/hostlist/gnunet-daemon-hostlist_server.c:729
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "`%s' non è un indirizzo IP valido.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:742
+#: src/hostlist/gnunet-daemon-hostlist_server.c:743
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr "`%s' non è un indirizzo IP valido.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:764
+#: src/hostlist/gnunet-daemon-hostlist_server.c:765
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "`%s' non è un indirizzo IP valido.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:785
+#: src/hostlist/gnunet-daemon-hostlist_server.c:786
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "`%s' non è un indirizzo IP valido.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:828
+#: src/hostlist/gnunet-daemon-hostlist_server.c:829
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:193
+#: src/identity/gnunet-identity.c:209
 #, c-format
 msgid "Failed to create ego: %s\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:233
+#: src/identity/gnunet-identity.c:250
 #, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:391
+#: src/identity/gnunet-identity.c:445
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:396
+#: src/identity/gnunet-identity.c:450
 msgid "delete ego NAME "
 msgstr ""
 
-#: src/identity/gnunet-identity.c:400
+#: src/identity/gnunet-identity.c:455
+msgid ""
+"set the private key for the identity to PRIVATE_KEY (use together with -C)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:459
 msgid "display all egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:404
+#: src/identity/gnunet-identity.c:463
 msgid "reduce output"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:411
+#: src/identity/gnunet-identity.c:470
 msgid ""
 "set default identity to NAME for a subsystem SUBSYSTEM (use together with -"
 "s) or restrict results to NAME (use together with -d)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:415
+#: src/identity/gnunet-identity.c:474
 msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:419
+#: src/identity/gnunet-identity.c:478
 msgid "display private keys as well"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:426
+#: src/identity/gnunet-identity.c:485
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:438
+#: src/identity/gnunet-identity.c:500
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:484
+#: src/identity/gnunet-service-identity.c:503
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:507
+#: src/identity/gnunet-service-identity.c:528
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:597
-#: src/identity/gnunet-service-identity.c:871
-#: src/identity/gnunet-service-identity.c:991
+#: src/identity/gnunet-service-identity.c:621
+#: src/identity/gnunet-service-identity.c:898
+#: src/identity/gnunet-service-identity.c:1018
 #, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:607
+#: src/identity/gnunet-service-identity.c:631
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:700
+#: src/identity/gnunet-service-identity.c:726
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:847
+#: src/identity/gnunet-service-identity.c:874
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:889
-#: src/identity/gnunet-service-identity.c:1009
+#: src/identity/gnunet-service-identity.c:916
+#: src/identity/gnunet-service-identity.c:1035
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:1043
+#: src/identity/gnunet-service-identity.c:1072
 #, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:1099
+#: src/identity/gnunet-service-identity.c:1130
 #, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:1108
+#: src/identity/gnunet-service-identity.c:1139
 #, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr ""
 
-#: src/identity/plugin_rest_identity.c:1359
+#: src/identity/plugin_rest_identity.c:1406
 msgid "Identity REST API initialized\n"
 msgstr ""
 
@@ -4729,7 +4734,7 @@ msgstr "# messaggi PONG ricevuti"
 msgid "You must specify a name\n"
 msgstr "È necessario specificare un nome\n"
 
-#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:1608
+#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:1639
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -4737,7 +4742,7 @@ msgstr ""
 msgid "specifies the public key of the zone to look in"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:1669
+#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:1700
 msgid "GNUnet zone manipulation tool"
 msgstr ""
 
@@ -4843,9 +4848,10 @@ msgstr "Impossibile avviare il servizio ' %s'\n"
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1014 src/namestore/gnunet-namestore.c:1047
-#: src/namestore/gnunet-namestore.c:1057 src/namestore/gnunet-namestore.c:1075
-#: src/namestore/gnunet-namestore.c:1096 src/namestore/gnunet-namestore.c:1123
+#: src/namestore/gnunet-namestore.c:1014 src/namestore/gnunet-namestore.c:1065
+#: src/namestore/gnunet-namestore.c:1075 src/namestore/gnunet-namestore.c:1104
+#: src/namestore/gnunet-namestore.c:1125 src/namestore/gnunet-namestore.c:1152
+#: src/namestore/gnunet-namestore.c:1228
 #, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr ""
@@ -4854,52 +4860,58 @@ msgstr ""
 msgid "replace"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1049 src/namestore/gnunet-namestore.c:1059
-#: src/namestore/gnunet-namestore.c:1077 src/namestore/gnunet-namestore.c:1098
+#: src/namestore/gnunet-namestore.c:1045
+#, c-format
+msgid "Invalid nick `%s'\n"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1067 src/namestore/gnunet-namestore.c:1077
+#: src/namestore/gnunet-namestore.c:1106 src/namestore/gnunet-namestore.c:1127
+#: src/namestore/gnunet-namestore.c:1230
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1067
+#: src/namestore/gnunet-namestore.c:1085
 #, c-format
 msgid "Unsupported type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1086
+#: src/namestore/gnunet-namestore.c:1095
+#, c-format
+msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1115
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1105
+#: src/namestore/gnunet-namestore.c:1134 src/namestore/gnunet-namestore.c:1237
 #, c-format
 msgid "Invalid time format `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1125
+#: src/namestore/gnunet-namestore.c:1154
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1168
+#: src/namestore/gnunet-namestore.c:1197
 #, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1191
+#: src/namestore/gnunet-namestore.c:1220
 #: src/peerinfo-tool/gnunet-peerinfo.c:736
 #, c-format
 msgid "Invalid URI `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1217
-#, c-format
-msgid "Invalid nick `%s'\n"
-msgstr ""
-
-#: src/namestore/gnunet-namestore.c:1259
+#: src/namestore/gnunet-namestore.c:1290
 #, c-format
 msgid "Label `%s' contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1309
+#: src/namestore/gnunet-namestore.c:1340
 #, c-format
 msgid ""
 "No default identity configured for `namestore' subsystem\n"
@@ -4907,161 +4919,161 @@ msgid ""
 "Run gnunet-identity -d to get a list of choices for $NAME\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1374
+#: src/namestore/gnunet-namestore.c:1405
 #, c-format
 msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1403
+#: src/namestore/gnunet-namestore.c:1434
 #, c-format
 msgid "Cannot connect to identity service\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1450
+#: src/namestore/gnunet-namestore.c:1481
 msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1462
+#: src/namestore/gnunet-namestore.c:1493
 #, c-format
 msgid "Invalid expiration time `%s' (must be without unit)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1474 src/namestore/gnunet-namestore.c:1490
-#: src/namestore/gnunet-namestore.c:1507
+#: src/namestore/gnunet-namestore.c:1505 src/namestore/gnunet-namestore.c:1521
+#: src/namestore/gnunet-namestore.c:1538
 #, c-format
 msgid "Missing entries in record line `%s'.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1482
+#: src/namestore/gnunet-namestore.c:1513
 #, fuzzy, c-format
 msgid "Unknown record type `%s'\n"
 msgstr "Comando `%s' sconosciuto.\n"
 
-#: src/namestore/gnunet-namestore.c:1520
+#: src/namestore/gnunet-namestore.c:1551
 #, fuzzy, c-format
 msgid "Invalid record data for type %s: `%s'.\n"
 msgstr "Indirizzo IPv6 non valido: `%s'\n"
 
-#: src/namestore/gnunet-namestore.c:1577
+#: src/namestore/gnunet-namestore.c:1608
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1580
+#: src/namestore/gnunet-namestore.c:1611
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1584
+#: src/namestore/gnunet-namestore.c:1615
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1591
+#: src/namestore/gnunet-namestore.c:1622
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1597
+#: src/namestore/gnunet-namestore.c:1628
 msgid "set the desired nick name for the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1602
+#: src/namestore/gnunet-namestore.c:1633
 msgid "monitor changes in the namestore"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1614
+#: src/namestore/gnunet-namestore.c:1645
 msgid "determine our name for the given PKEY"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1621
+#: src/namestore/gnunet-namestore.c:1652
 msgid ""
 "set record set to values given by (possibly multiple) RECORDLINES; can be "
 "specified multiple times"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1627
+#: src/namestore/gnunet-namestore.c:1658
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1632
+#: src/namestore/gnunet-namestore.c:1663
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1638
+#: src/namestore/gnunet-namestore.c:1669
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1642
+#: src/namestore/gnunet-namestore.c:1673
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1648
+#: src/namestore/gnunet-namestore.c:1679
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1654
+#: src/namestore/gnunet-namestore.c:1685
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:551
+#: src/namestore/gnunet-namestore-fcfsd.c:552
 #, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:578
+#: src/namestore/gnunet-namestore-fcfsd.c:579
 #, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:599
+#: src/namestore/gnunet-namestore-fcfsd.c:600
 msgid "Error when mapping zone to name\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:631
+#: src/namestore/gnunet-namestore-fcfsd.c:632
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:693
+#: src/namestore/gnunet-namestore-fcfsd.c:694
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:783
+#: src/namestore/gnunet-namestore-fcfsd.c:784
 #, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:802
+#: src/namestore/gnunet-namestore-fcfsd.c:803
 #, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:839
+#: src/namestore/gnunet-namestore-fcfsd.c:840
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:848
+#: src/namestore/gnunet-namestore-fcfsd.c:849
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1083
+#: src/namestore/gnunet-namestore-fcfsd.c:1084
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1114
+#: src/namestore/gnunet-namestore-fcfsd.c:1115
 msgid "Failed to start HTTP server\n"
 msgstr "Impossibile avviare il server HTTP\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1162
+#: src/namestore/gnunet-namestore-fcfsd.c:1163
 msgid "Failed to connect to identity\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1189
+#: src/namestore/gnunet-namestore-fcfsd.c:1190
 msgid "name of the zone that is to be managed by FCFSD"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1209
+#: src/namestore/gnunet-namestore-fcfsd.c:1210
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
@@ -5096,7 +5108,7 @@ msgstr ""
 msgid "Flat file database running\n"
 msgstr ""
 
-#: src/namestore/plugin_rest_namestore.c:925
+#: src/namestore/plugin_rest_namestore.c:1093
 msgid "Namestore REST API initialized\n"
 msgstr ""
 
@@ -5399,8 +5411,8 @@ msgstr ""
 msgid "Measure quality and performance of the NSE service."
 msgstr ""
 
-#: src/nse/gnunet-service-nse.c:1437
-#: src/revocation/gnunet-service-revocation.c:846 src/util/gnunet-scrypt.c:247
+#: src/nse/gnunet-service-nse.c:1438
+#: src/revocation/gnunet-service-revocation.c:842 src/util/gnunet-scrypt.c:250
 msgid "Value is too large.\n"
 msgstr ""
 
@@ -5469,7 +5481,7 @@ msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:292
-#: src/peerinfo-tool/plugin_rest_peerinfo.c:499
+#: src/peerinfo-tool/plugin_rest_peerinfo.c:501
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "Impossibile avviare il servizio ' %s'\n"
@@ -5548,7 +5560,7 @@ msgstr ""
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr ""
 
-#: src/peerinfo-tool/plugin_rest_peerinfo.c:795
+#: src/peerinfo-tool/plugin_rest_peerinfo.c:797
 msgid "Peerinfo REST API initialized\n"
 msgstr ""
 
@@ -5652,82 +5664,94 @@ msgstr ""
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:617
+#: src/reclaim/gnunet-reclaim.c:799
 #, c-format
 msgid "Ego is required\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:624
+#: src/reclaim/gnunet-reclaim.c:806
 #, c-format
 msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:631
+#: src/reclaim/gnunet-reclaim.c:813
 #, c-format
 msgid "Requesting party key is required!\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:649
+#: src/reclaim/gnunet-reclaim.c:831
 msgid "Add an attribute NAME"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:654
+#: src/reclaim/gnunet-reclaim.c:836
 msgid "Delete the attribute with ID"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:659
+#: src/reclaim/gnunet-reclaim.c:841
 msgid "The attribute VALUE"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:664
+#: src/reclaim/gnunet-reclaim.c:846
 msgid "The EGO to use"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:670
+#: src/reclaim/gnunet-reclaim.c:852
 msgid "Specify the relying party for issue"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:674
+#: src/reclaim/gnunet-reclaim.c:856
 msgid "List attributes for EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:681
+#: src/reclaim/gnunet-reclaim.c:860
+msgid "List attestations for EGO"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:866
+msgid "Attestation to use for attribute"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:871
+msgid "Attestation name"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:877
 msgid "Issue a ticket for a set of attributes separated by comma"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:686
+#: src/reclaim/gnunet-reclaim.c:882
 msgid "Consume a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:691
+#: src/reclaim/gnunet-reclaim.c:887
 msgid "Revoke a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:696
+#: src/reclaim/gnunet-reclaim.c:892
 msgid "Type of attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:700
+#: src/reclaim/gnunet-reclaim.c:896
 msgid "List tickets of ego"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:706
+#: src/reclaim/gnunet-reclaim.c:902
 msgid "Expiration interval of the attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:714
+#: src/reclaim/gnunet-reclaim.c:910
 msgid "re:claimID command line tool"
 msgstr ""
 
-#: src/reclaim/plugin_rest_openid_connect.c:2340
+#: src/reclaim/plugin_rest_openid_connect.c:2481
 msgid "OpenID Connect REST API initialized\n"
 msgstr ""
 
-#: src/reclaim/plugin_rest_reclaim.c:1899
+#: src/reclaim/plugin_rest_reclaim.c:1476
 msgid "Identity Provider REST API initialized\n"
 msgstr ""
 
-#: src/reclaim/reclaim_api.c:436
+#: src/reclaim/reclaim_api.c:540
 #, fuzzy
 msgid "failed to store record\n"
 msgstr "Impossibile avviare il servizio.\n"
@@ -5816,11 +5840,11 @@ msgstr ""
 msgid "Search string `%s' is too long!\n"
 msgstr ""
 
-#: src/rest/gnunet-rest-server.c:1047
+#: src/rest/gnunet-rest-server.c:1051
 msgid "GNUnet REST server"
 msgstr ""
 
-#: src/rest/plugin_rest_config.c:401
+#: src/rest/plugin_rest_config.c:402
 msgid "CONFIG REST API initialized\n"
 msgstr ""
 
@@ -5828,133 +5852,150 @@ msgstr ""
 msgid "COPYING REST API initialized\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:127
+#: src/revocation/gnunet-revocation.c:114
+#, fuzzy
+msgid "Shutting down...\n"
+msgstr "Avvio di %s in corso...\n"
+
+#: src/revocation/gnunet-revocation.c:146
 #, c-format
 msgid "Key `%s' is valid\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:131
+#: src/revocation/gnunet-revocation.c:150
 #, c-format
 msgid "Key `%s' has been revoked\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:135
+#: src/revocation/gnunet-revocation.c:154
 msgid "Internal error\n"
 msgstr "Errore interno\n"
 
-#: src/revocation/gnunet-revocation.c:161
+#: src/revocation/gnunet-revocation.c:180
 #, c-format
 msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:164
+#: src/revocation/gnunet-revocation.c:183
 msgid "Revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:170
+#: src/revocation/gnunet-revocation.c:189
 #, c-format
 msgid "Key for ego `%s' has been successfully revoked\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:173
+#: src/revocation/gnunet-revocation.c:192
 msgid "Revocation successful.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:179
+#: src/revocation/gnunet-revocation.c:198
 msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:312
+#: src/revocation/gnunet-revocation.c:251
+msgid "Cancelling calculation.\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:296
 #, c-format
 msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:338
+#: src/revocation/gnunet-revocation.c:335
 #, c-format
 msgid "Ego `%s' not found.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:351
+#: src/revocation/gnunet-revocation.c:349
 #, c-format
 msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:368
+#: src/revocation/gnunet-revocation.c:359
 msgid "Revocation certificate ready\n"
 msgstr ""
 
+#: src/revocation/gnunet-revocation.c:371
+msgid "Continuing calculation where left off...\n"
+msgstr ""
+
 #: src/revocation/gnunet-revocation.c:378
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:409
+#: src/revocation/gnunet-revocation.c:416
 #, c-format
 msgid "Public key `%s' malformed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:419
+#: src/revocation/gnunet-revocation.c:426
 msgid ""
 "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:438
+#: src/revocation/gnunet-revocation.c:456
 msgid "No filename to store revocation certificate given.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:451
+#: src/revocation/gnunet-revocation.c:471
 #, c-format
 msgid "Failed to read revocation certificate from `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:471
+#: src/revocation/gnunet-revocation.c:493
 msgid "No action specified. Nothing to do.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:490
+#: src/revocation/gnunet-revocation.c:512
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:498
+#: src/revocation/gnunet-revocation.c:520
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:505
+#: src/revocation/gnunet-revocation.c:527
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:512
+#: src/revocation/gnunet-revocation.c:534
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:458
+#: src/revocation/gnunet-revocation.c:540
+msgid "number of epochs to calculate for"
+msgstr ""
+
+#: src/revocation/gnunet-service-revocation.c:454
 msgid "# unsupported revocations received via set union"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:468
+#: src/revocation/gnunet-service-revocation.c:464
 #, fuzzy
 msgid "# revocation messages received via set union"
 msgstr "# messaggi PONG ricevuti"
 
-#: src/revocation/gnunet-service-revocation.c:474
+#: src/revocation/gnunet-service-revocation.c:470
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:478
+#: src/revocation/gnunet-service-revocation.c:474
 msgid "# revocation set unions failed"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:490
+#: src/revocation/gnunet-service-revocation.c:486
 msgid "# revocation set unions completed"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:530
+#: src/revocation/gnunet-service-revocation.c:526
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:871
+#: src/revocation/gnunet-service-revocation.c:881
 msgid "Could not open revocation database file!"
 msgstr ""
 
@@ -6136,92 +6177,92 @@ msgstr ""
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:409
-#: src/statistics/gnunet-statistics.c:448
+#: src/statistics/gnunet-statistics.c:413
+#: src/statistics/gnunet-statistics.c:455
 msgid "Failed to obtain statistics.\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:412
-#: src/statistics/gnunet-statistics.c:451
+#: src/statistics/gnunet-statistics.c:416
+#: src/statistics/gnunet-statistics.c:458
 #, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:526
+#: src/statistics/gnunet-statistics.c:532
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:532
+#: src/statistics/gnunet-statistics.c:538
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:571
+#: src/statistics/gnunet-statistics.c:577
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:583
+#: src/statistics/gnunet-statistics.c:589
 #, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:710
+#: src/statistics/gnunet-statistics.c:725
 #, c-format
 msgid "Invalid argument `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:726
+#: src/statistics/gnunet-statistics.c:742
 #, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:735
+#: src/statistics/gnunet-statistics.c:751
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:764
+#: src/statistics/gnunet-statistics.c:783
 #, c-format
 msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:797
+#: src/statistics/gnunet-statistics.c:816
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:803
+#: src/statistics/gnunet-statistics.c:821
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:810
+#: src/statistics/gnunet-statistics.c:827
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:816
+#: src/statistics/gnunet-statistics.c:832
 msgid "use as csv separator"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:823
+#: src/statistics/gnunet-statistics.c:838
 msgid "path to the folder containing the testbed data"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:829
+#: src/statistics/gnunet-statistics.c:843
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:834
+#: src/statistics/gnunet-statistics.c:847
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:840
+#: src/statistics/gnunet-statistics.c:852
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:846
+#: src/statistics/gnunet-statistics.c:857
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:861
+#: src/statistics/gnunet-statistics.c:874
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
@@ -6312,7 +6353,7 @@ msgid ""
 msgstr ""
 
 #: src/testbed/gnunet-daemon-testbed-underlay.c:234 src/testing/list-keys.c:47
-#: src/testing/testing.c:284 src/util/gnunet-ecc.c:292
+#: src/testing/testing.c:284 src/util/gnunet-ecc.c:318
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
@@ -6689,37 +6730,37 @@ msgstr ""
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:2227
-#: src/transport/gnunet-communicator-udp.c:2712
-#: src/transport/gnunet-service-tng.c:10024
-#: src/transport/gnunet-service-transport.c:2627
+#: src/transport/gnunet-communicator-tcp.c:2458
+#: src/transport/gnunet-communicator-udp.c:2825
+#: src/transport/gnunet-service-tng.c:10027
+#: src/transport/gnunet-service-transport.c:2624
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:2285
+#: src/transport/gnunet-communicator-tcp.c:2754
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:2784
+#: src/transport/gnunet-communicator-udp.c:2897
 msgid "GNUnet UDP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:782
+#: src/transport/gnunet-communicator-unix.c:788
 msgid ""
 "Maximum number of UNIX connections exceeded, dropping incoming message\n"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:1009
+#: src/transport/gnunet-communicator-unix.c:1015
 msgid "UNIX communicator is lacking key configuration settings. Exiting.\n"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:1054
+#: src/transport/gnunet-communicator-unix.c:1060
 #: src/transport/plugin_transport_unix.c:1383
 #, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:1132
+#: src/transport/gnunet-communicator-unix.c:1138
 msgid "GNUnet UNIX domain socket communicator"
 msgstr ""
 
@@ -6731,38 +6772,38 @@ msgstr ""
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:791
+#: src/transport/gnunet-service-transport.c:794
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1474
+#: src/transport/gnunet-service-transport.c:1477
 msgid "# bytes payload discarded due to not connected peer"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1619
+#: src/transport/gnunet-service-transport.c:1622
 msgid "# bytes total received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1709
+#: src/transport/gnunet-service-transport.c:1712
 msgid "# bytes payload received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2013
-#: src/transport/gnunet-service-transport.c:2452
+#: src/transport/gnunet-service-transport.c:2016
+#: src/transport/gnunet-service-transport.c:2450
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2456
+#: src/transport/gnunet-service-transport.c:2454
 #, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2551
+#: src/transport/gnunet-service-transport.c:2549
 #, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2560
+#: src/transport/gnunet-service-transport.c:2558
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
@@ -7002,7 +7043,7 @@ msgstr ""
 #: src/transport/gnunet-service-transport_validation.c:489
 #: src/transport/gnunet-service-transport_validation.c:679
 #: src/transport/gnunet-service-transport_validation.c:1000
-#: src/transport/gnunet-service-transport_validation.c:1626
+#: src/transport/gnunet-service-transport_validation.c:1627
 msgid "# validations running"
 msgstr ""
 
@@ -7055,32 +7096,32 @@ msgid ""
 "having this address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1278
+#: src/transport/gnunet-service-transport_validation.c:1279
 #, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1330
+#: src/transport/gnunet-service-transport_validation.c:1331
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1339
+#: src/transport/gnunet-service-transport_validation.c:1340
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1514
+#: src/transport/gnunet-service-transport_validation.c:1515
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1532
+#: src/transport/gnunet-service-transport_validation.c:1533
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1589
+#: src/transport/gnunet-service-transport_validation.c:1590
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1644
+#: src/transport/gnunet-service-transport_validation.c:1645
 msgid "# HELLOs given to peerinfo"
 msgstr ""
 
@@ -7669,17 +7710,17 @@ msgstr ""
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1397
+#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1396
 #, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1409
+#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1408
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1416
+#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1415
 #, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr ""
@@ -7691,7 +7732,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:345 src/util/service.c:834
+#: src/transport/tcp_service_legacy.c:345 src/util/service.c:833
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
@@ -7701,23 +7742,23 @@ msgstr ""
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:410 src/util/service.c:947
+#: src/transport/tcp_service_legacy.c:410 src/util/service.c:946
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:451 src/util/service.c:988
+#: src/transport/tcp_service_legacy.c:451 src/util/service.c:987
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:890
-#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1477
+#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1476
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1501
+#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1500
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -7732,29 +7773,29 @@ msgstr ""
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1747
+#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1746
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1752
+#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1751
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1757
+#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1756
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1253 src/util/disk.c:1177
-#: src/util/service.c:1638
+#: src/transport/tcp_service_legacy.c:1253 src/util/disk.c:1176
+#: src/util/service.c:1637
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1640
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1639
 msgid "No such user"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1654
+#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1653
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr ""
@@ -7764,13 +7805,13 @@ msgid "do daemonize (detach from terminal)"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:1397
-#: src/transport/transport-testing2.c:906 src/util/service.c:2070
-#: src/util/service.c:2082
+#: src/transport/transport-testing2.c:1061 src/util/service.c:2072
+#: src/util/service.c:2084
 #, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2092
+#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2094
 msgid "Malformed configuration, exit ...\n"
 msgstr ""
 
@@ -7779,39 +7820,89 @@ msgstr ""
 msgid "Could not access configuration file `%s'\n"
 msgstr ""
 
-#: src/transport/transport_api2_communication.c:704
+#: src/transport/transport_api2_communication.c:743
 msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/util/bio.c:177 src/util/bio.c:185
-#, c-format
-msgid "Error reading `%s': %s"
-msgstr ""
+#: src/util/bio.c:227 src/util/bio.c:235
+#, fuzzy, c-format
+msgid "Error reading `%s' from file: %s"
+msgstr "Errore di lettura da '%s': %s\n"
 
-#: src/util/bio.c:187
+#: src/util/bio.c:237
 msgid "End of file"
 msgstr "Fine del file"
 
-#: src/util/bio.c:244
+#: src/util/bio.c:266
+#, fuzzy, c-format
+msgid "Error while reading `%s' from buffer: %s"
+msgstr "Errore di lettura del file `%s'\n"
+
+#: src/util/bio.c:268
+msgid "Not enough data left"
+msgstr ""
+
+#: src/util/bio.c:308
+#, c-format
+msgid "Invalid handle type while reading `%s'"
+msgstr ""
+
+#: src/util/bio.c:335 src/util/bio.c:838
+msgid "string length"
+msgstr ""
+
+#: src/util/bio.c:341
+#, fuzzy, c-format
+msgid "%s (while reading `%s')"
+msgstr "Errore di lettura del file `%s'\n"
+
+#: src/util/bio.c:346
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:255
+#: src/util/bio.c:359
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:303
+#: src/util/bio.c:398 src/util/bio.c:863 src/util/bio.c:880
+msgid "metadata length"
+msgstr ""
+
+#: src/util/bio.c:410
 #, c-format
-msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
+msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:319
+#: src/util/bio.c:426
+#, fuzzy, c-format
+msgid "Failed to deserialize metadata `%s'"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
+#: src/util/bio.c:667
+msgid "Unable to flush buffer to file"
+msgstr ""
+
+#: src/util/bio.c:729 src/util/bio.c:750
+#, fuzzy, c-format
+msgid "Error while writing `%s' to file: %s"
+msgstr "Errore di lettura del file `%s'\n"
+
+#: src/util/bio.c:731
+msgid "No associated file"
+msgstr ""
+
+#: src/util/bio.c:815
 #, c-format
-msgid "Metadata `%s' failed to deserialize"
+msgid "Invalid handle type while writing `%s'"
 msgstr ""
 
+#: src/util/bio.c:875
+#, fuzzy, c-format
+msgid "Failed to serialize metadata `%s'"
+msgstr "Impossibile avviare il servizio ' %s'\n"
+
 #: src/util/client.c:747 src/util/client.c:937
 msgid "not a valid filename"
 msgstr ""
@@ -7821,27 +7912,27 @@ msgstr ""
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:259 src/util/common_logging.c:1112
+#: src/util/common_logging.c:259 src/util/common_logging.c:1114
 msgid "DEBUG"
 msgstr "DEBUG"
 
-#: src/util/common_logging.c:261 src/util/common_logging.c:1110
+#: src/util/common_logging.c:261 src/util/common_logging.c:1112
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:263 src/util/common_logging.c:1108
+#: src/util/common_logging.c:263 src/util/common_logging.c:1110
 msgid "MESSAGE"
 msgstr ""
 
-#: src/util/common_logging.c:265 src/util/common_logging.c:1106
+#: src/util/common_logging.c:265 src/util/common_logging.c:1108
 msgid "WARNING"
 msgstr "ATTENZIONE"
 
-#: src/util/common_logging.c:267 src/util/common_logging.c:1104
+#: src/util/common_logging.c:267 src/util/common_logging.c:1106
 msgid "ERROR"
 msgstr "ERRORE"
 
-#: src/util/common_logging.c:269 src/util/common_logging.c:1114
+#: src/util/common_logging.c:269 src/util/common_logging.c:1116
 msgid "NONE"
 msgstr "NESSUNA"
 
@@ -7850,29 +7941,29 @@ msgstr "NESSUNA"
 msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:902
+#: src/util/common_logging.c:904
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1115
+#: src/util/common_logging.c:1117
 msgid "INVALID"
 msgstr "NON VALIDO"
 
-#: src/util/common_logging.c:1396
+#: src/util/common_logging.c:1398
 msgid "unknown address"
 msgstr "indirizzo sconosciuto"
 
-#: src/util/common_logging.c:1441
+#: src/util/common_logging.c:1443
 msgid "invalid address"
 msgstr "indirizzo non valido"
 
-#: src/util/common_logging.c:1460
+#: src/util/common_logging.c:1462
 #, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 
-#: src/util/common_logging.c:1483
+#: src/util/common_logging.c:1485
 #, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -7923,41 +8014,17 @@ msgid ""
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:705
+#: src/util/crypto_ecc.c:663
 #, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:822
+#: src/util/crypto_ecc.c:791
 #, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_ecc_setup.c:136 src/util/crypto_ecc_setup.c:178
-#: src/util/crypto_ecc_setup.c:318 src/util/crypto_ecc_setup.c:360
-#, c-format
-msgid "Could not acquire lock on file `%s': %s...\n"
-msgstr ""
-
-#: src/util/crypto_ecc_setup.c:142 src/util/crypto_ecc_setup.c:324
-msgid "Creating a new private key.  This may take a while.\n"
-msgstr ""
-
-#: src/util/crypto_ecc_setup.c:184 src/util/crypto_ecc_setup.c:366
-msgid "This may be ok if someone is currently generating a private key.\n"
-msgstr ""
-
-#: src/util/crypto_ecc_setup.c:220 src/util/crypto_ecc_setup.c:402
-#, c-format
-msgid ""
-"When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
-msgstr ""
-
-#: src/util/crypto_ecc_setup.c:225 src/util/crypto_ecc_setup.c:407
-msgid "This may be ok if someone is currently generating a key.\n"
-msgstr ""
-
-#: src/util/crypto_ecc_setup.c:469
+#: src/util/crypto_ecc_setup.c:369
 msgid "Could not load peer's private key\n"
 msgstr ""
 
@@ -7966,17 +8033,17 @@ msgstr ""
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:956
+#: src/util/crypto_rsa.c:959
 #, c-format
 msgid "RSA signing failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/crypto_rsa.c:1314
+#: src/util/crypto_rsa.c:1318
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr ""
 
-#: src/util/disk.c:941
+#: src/util/disk.c:940
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr ""
@@ -8106,41 +8173,52 @@ msgstr ""
 msgid "use configuration file FILENAME"
 msgstr ""
 
-#: src/util/getopt_helpers.c:568 src/util/getopt_helpers.c:634
-#: src/util/getopt_helpers.c:835 src/util/getopt_helpers.c:900
+#: src/util/getopt_helpers.c:568 src/util/getopt_helpers.c:859
+#: src/util/getopt_helpers.c:924
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:659
+#: src/util/getopt_helpers.c:649
+#, c-format
+msgid ""
+"You must pass a relative time (optionally with sign) to the `%s' option.\n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:656
+#, c-format
+msgid "Value given for time travel `%s' option is too big.\n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:683
 msgid "[+/-]MICROSECONDS"
 msgstr ""
 
-#: src/util/getopt_helpers.c:661
+#: src/util/getopt_helpers.c:685
 msgid "modify system time by given offset (for debugging/testing only)"
 msgstr ""
 
-#: src/util/getopt_helpers.c:696
+#: src/util/getopt_helpers.c:720
 #, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:761
+#: src/util/getopt_helpers.c:785
 #, c-format
 msgid "You must pass absolute time to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:828
+#: src/util/getopt_helpers.c:852
 #, c-format
 msgid "Your input for the '%s' option has to be a non negative number\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:907
+#: src/util/getopt_helpers.c:931
 #, c-format
 msgid "You must pass a number below %u to the `%s' option.\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:994
+#: src/util/getopt_helpers.c:1018
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
@@ -8212,7 +8290,7 @@ msgstr ""
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:175
+#: src/util/gnunet-ecc.c:177
 #, c-format
 msgid ""
 "\n"
@@ -8235,54 +8313,54 @@ msgid ""
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:277
+#: src/util/gnunet-ecc.c:303
 #, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:287
+#: src/util/gnunet-ecc.c:313
 #, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:307
+#: src/util/gnunet-ecc.c:333
 #, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:361
+#: src/util/gnunet-ecc.c:387
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:425
+#: src/util/gnunet-ecc.c:451
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:431
+#: src/util/gnunet-ecc.c:457
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:437
+#: src/util/gnunet-ecc.c:463
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:442
+#: src/util/gnunet-ecc.c:468
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:447
+#: src/util/gnunet-ecc.c:473
 msgid "print the private key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:452
+#: src/util/gnunet-ecc.c:478
 msgid "print the public key in HEX format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:458
+#: src/util/gnunet-ecc.c:484
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:472
+#: src/util/gnunet-ecc.c:498
 msgid "Manipulate GNUnet private ECC key files"
 msgstr ""
 
@@ -8317,32 +8395,32 @@ msgstr ""
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:179
+#: src/util/gnunet-resolver.c:182
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:219
+#: src/util/gnunet-scrypt.c:222
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:285
+#: src/util/gnunet-scrypt.c:288
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:291
+#: src/util/gnunet-scrypt.c:294
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:297
+#: src/util/gnunet-scrypt.c:300
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:303
+#: src/util/gnunet-scrypt.c:306
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:316
+#: src/util/gnunet-scrypt.c:319
 msgid "Manipulate GNUnet proof of work files"
 msgstr ""
 
@@ -8385,19 +8463,19 @@ msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:408
+#: src/util/os_installation.c:409
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:791
+#: src/util/os_installation.c:792
 #, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr ""
 
-#: src/util/os_installation.c:824
+#: src/util/os_installation.c:825
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
@@ -8473,14 +8551,14 @@ msgstr ""
 msgid "Could not resolve our FQDN: %s\n"
 msgstr ""
 
-#: src/util/service.c:654
+#: src/util/service.c:653
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
-#: src/util/service.c:1569
+#: src/util/service.c:1568
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
@@ -8495,116 +8573,116 @@ msgstr ""
 msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
 
-#: src/util/strings.c:177
+#: src/util/strings.c:178
 msgid "b"
 msgstr ""
 
-#: src/util/strings.c:498
+#: src/util/strings.c:502
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:622
+#: src/util/strings.c:636
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:691
+#: src/util/strings.c:705
 msgid "µs"
 msgstr "µs"
 
-#: src/util/strings.c:695
+#: src/util/strings.c:709
 msgid "forever"
 msgstr "per sempre"
 
-#: src/util/strings.c:697
+#: src/util/strings.c:711
 msgid "0 ms"
 msgstr "0 ms"
 
-#: src/util/strings.c:701
+#: src/util/strings.c:715
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:705
+#: src/util/strings.c:719
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:709
+#: src/util/strings.c:723
 msgid "m"
 msgstr ""
 
-#: src/util/strings.c:713
+#: src/util/strings.c:727
 msgid "h"
 msgstr "o"
 
-#: src/util/strings.c:719
+#: src/util/strings.c:733
 msgid "day"
 msgstr "giorno"
 
-#: src/util/strings.c:721
+#: src/util/strings.c:735
 msgid "days"
 msgstr "giorni"
 
-#: src/util/strings.c:749
+#: src/util/strings.c:763
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1219
+#: src/util/strings.c:1239
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1227
+#: src/util/strings.c:1247
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1234
+#: src/util/strings.c:1254
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1242
+#: src/util/strings.c:1262
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1251
+#: src/util/strings.c:1271
 #, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr ""
 
-#: src/util/strings.c:1479 src/util/strings.c:1490
+#: src/util/strings.c:1498 src/util/strings.c:1509
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1499
+#: src/util/strings.c:1518
 #, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1582 src/util/strings.c:1611 src/util/strings.c:1658
-#: src/util/strings.c:1678
+#: src/util/strings.c:1601 src/util/strings.c:1630 src/util/strings.c:1677
+#: src/util/strings.c:1697
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1636
+#: src/util/strings.c:1655
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr ""
 
-#: src/util/strings.c:1687
+#: src/util/strings.c:1706
 #, c-format
 msgid "Invalid format: `%s'\n"
 msgstr ""
 
-#: src/util/strings.c:1740
+#: src/util/strings.c:1759
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr ""
 
-#: src/util/strings.c:1790
+#: src/util/strings.c:1809
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr ""
 
-#: src/util/strings.c:1821
+#: src/util/strings.c:1840
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 804d41284..355616dc9 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNUnet 0.7.0b\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2020-02-13 20:41+0100\n"
+"POT-Creation-Date: 2020-07-07 12:22+0200\n"
 "PO-Revision-Date: 2006-01-21 17:16+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -16,126 +16,126 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/abd/gnunet-abd.c:397 src/namestore/gnunet-namestore.c:1271
+#: src/abd/gnunet-abd.c:397 src/namestore/gnunet-namestore.c:1302
 #, fuzzy, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr "\"%s\": okänd tjänst: %s\n"
 
-#: src/abd/gnunet-abd.c:413 src/abd/gnunet-abd.c:886
+#: src/abd/gnunet-abd.c:413 src/abd/gnunet-abd.c:896
 #, fuzzy, c-format
 msgid "Issuer public key `%s' is not well-formed\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1747
+#: src/abd/gnunet-abd.c:560 src/abd/gnunet-service-abd.c:1747
 #: src/namestore/gnunet-namestore.c:1001
-#: src/namestore/gnunet-namestore-fcfsd.c:1153
+#: src/namestore/gnunet-namestore-fcfsd.c:1154
 #, fuzzy, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/abd/gnunet-abd.c:825 src/abd/gnunet-abd.c:876
+#: src/abd/gnunet-abd.c:835 src/abd/gnunet-abd.c:886
 #, fuzzy, c-format
 msgid "Issuer public key not well-formed\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/abd/gnunet-abd.c:834 src/abd/gnunet-abd.c:895
+#: src/abd/gnunet-abd.c:844 src/abd/gnunet-abd.c:905
 #, fuzzy, c-format
 msgid "Failed to connect to ABD\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/abd/gnunet-abd.c:840
+#: src/abd/gnunet-abd.c:850
 #, c-format
 msgid "You must provide issuer the attribute\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:847
+#: src/abd/gnunet-abd.c:857
 #, c-format
 msgid "ego required\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:857
+#: src/abd/gnunet-abd.c:867
 #, c-format
 msgid "Subject public key needed\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:866
+#: src/abd/gnunet-abd.c:876
 #, fuzzy, c-format
 msgid "Subject public key `%s' is not well-formed\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/abd/gnunet-abd.c:901
+#: src/abd/gnunet-abd.c:911
 #, c-format
 msgid "You must provide issuer and subject attributes\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:957
+#: src/abd/gnunet-abd.c:970
 #, c-format
 msgid "Please specify name to lookup, subject key and issuer key!\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:978
+#: src/abd/gnunet-abd.c:991
 msgid "verify credential against attribute"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:985
+#: src/abd/gnunet-abd.c:998
 #, fuzzy
 msgid ""
 "The public key of the subject to lookup thecredential for, or for issuer "
 "side storage: subject and its attributes"
 msgstr "ange prioritet för innehållet"
 
-#: src/abd/gnunet-abd.c:992
+#: src/abd/gnunet-abd.c:1005
 msgid "The private, signed delegate presented by the subject"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:999
+#: src/abd/gnunet-abd.c:1012
 #, fuzzy
 msgid "The public key of the authority to verify the credential against"
 msgstr "ange prioritet för innehållet"
 
-#: src/abd/gnunet-abd.c:1004
+#: src/abd/gnunet-abd.c:1017
 #, fuzzy
 msgid "The ego/zone name to use"
 msgstr "meddelandestorlek"
 
-#: src/abd/gnunet-abd.c:1010
+#: src/abd/gnunet-abd.c:1023
 msgid "The issuer attribute to verify against or to issue"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1016
+#: src/abd/gnunet-abd.c:1029
 msgid ""
 "The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1021
+#: src/abd/gnunet-abd.c:1034
 msgid "collect credentials"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1026
+#: src/abd/gnunet-abd.c:1039
 msgid "Create and issue a credential issuer side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1031
+#: src/abd/gnunet-abd.c:1044
 msgid "Issue a credential subject side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1036
+#: src/abd/gnunet-abd.c:1049
 msgid "Create, sign and return a credential subject side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1043
+#: src/abd/gnunet-abd.c:1056
 msgid "Import signed credentials that should be issued to a zone/ego"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1047
+#: src/abd/gnunet-abd.c:1060
 msgid "Create private record entry."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1053 src/abd/gnunet-abd.c:1059
+#: src/abd/gnunet-abd.c:1066 src/abd/gnunet-abd.c:1072
 msgid "Indicates that the collect/verify process is done via forward search."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1072
+#: src/abd/gnunet-abd.c:1085
 #, fuzzy
 msgid "GNUnet abd resolver tool"
 msgstr "Spåra GNUnets nätverkstopologi."
@@ -385,28 +385,28 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:1129
 #: src/transport/plugin_transport_tcp.c:3706
 #: src/transport/tcp_service_legacy.c:594
-#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1091
-#: src/util/service.c:1097
+#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1090
+#: src/util/service.c:1096
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:452 src/transport/plugin_transport_tcp.c:1163
 #: src/transport/tcp_service_legacy.c:634 src/util/client.c:527
-#: src/util/service.c:1130
+#: src/util/service.c:1129
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:456 src/transport/plugin_transport_tcp.c:1167
 #: src/transport/tcp_service_legacy.c:638 src/util/client.c:532
-#: src/util/service.c:1134
+#: src/util/service.c:1133
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
 #: src/arm/gnunet-service-arm.c:484 src/transport/plugin_transport_tcp.c:1195
-#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1154
+#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1153
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -414,7 +414,7 @@ msgid ""
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:505 src/transport/plugin_transport_tcp.c:1213
-#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1172
+#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1171
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
@@ -422,7 +422,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:536
 #: src/transport/plugin_transport_http_server.c:2718
 #: src/transport/plugin_transport_tcp.c:1244
-#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1203
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1202
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
@@ -430,7 +430,7 @@ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 #: src/arm/gnunet-service-arm.c:555
 #: src/transport/plugin_transport_http_server.c:2736
 #: src/transport/plugin_transport_tcp.c:1263
-#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1222
+#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1221
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
@@ -569,12 +569,12 @@ msgstr ""
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "Kunde inte initiera SQLite.\n"
 
-#: src/ats/plugin_ats_proportional.c:1140
+#: src/ats/plugin_ats_proportional.c:1142
 #, fuzzy, c-format
 msgid "Invalid %s configuration %f \n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/ats/plugin_ats_proportional.c:1163
+#: src/ats/plugin_ats_proportional.c:1165
 #, fuzzy, c-format
 msgid "Invalid %s configuration %f\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
@@ -763,7 +763,7 @@ msgstr ""
 
 #: src/auction/gnunet-auction-info.c:77 src/auction/gnunet-auction-join.c:77
 #: src/conversation/gnunet-conversation-test.c:256
-#: src/revocation/gnunet-revocation.c:524 src/template/gnunet-template.c:75
+#: src/revocation/gnunet-revocation.c:552 src/template/gnunet-template.c:75
 #, fuzzy
 msgid "help text"
 msgstr "hjälptext för -t"
@@ -1386,12 +1386,12 @@ msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 msgid "# messages of type %u discarded (client busy)"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core.c:926
+#: src/core/gnunet-service-core.c:927
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/core/gnunet-service-core.c:945
+#: src/core/gnunet-service-core.c:955
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "\"%s\" är inte en fil.\n"
@@ -1422,132 +1422,132 @@ msgstr ""
 msgid "# PING messages transmitted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:978
+#: src/core/gnunet-service-core_kx.c:979
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:992
+#: src/core/gnunet-service-core_kx.c:993
 #, fuzzy
 msgid "# duplicate ephemeral keys ignored"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1027
+#: src/core/gnunet-service-core_kx.c:1028
 #, fuzzy
 msgid "# EPHEMERAL_KEYs rejected (bad signature)"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1045
+#: src/core/gnunet-service-core_kx.c:1046
 #, c-format
 msgid ""
 "EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match "
 "our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1052
+#: src/core/gnunet-service-core_kx.c:1053
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages rejected due to time"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1070
+#: src/core/gnunet-service-core_kx.c:1071
 #, fuzzy
 msgid "# valid ephemeral keys received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1179
+#: src/core/gnunet-service-core_kx.c:1180
 #: src/transport/gnunet-service-transport_validation.c:1133
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1189
+#: src/core/gnunet-service-core_kx.c:1190
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:1238
+#: src/core/gnunet-service-core_kx.c:1239
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1263
+#: src/core/gnunet-service-core_kx.c:1264
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1276
+#: src/core/gnunet-service-core_kx.c:1277
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# PING-meddelanden i klartext skickade"
 
-#: src/core/gnunet-service-core_kx.c:1333
-#: src/transport/gnunet-service-transport_validation.c:1475
+#: src/core/gnunet-service-core_kx.c:1334
+#: src/transport/gnunet-service-transport_validation.c:1476
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1341
+#: src/core/gnunet-service-core_kx.c:1342
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/core/gnunet-service-core_kx.c:1349
+#: src/core/gnunet-service-core_kx.c:1350
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/core/gnunet-service-core_kx.c:1388
+#: src/core/gnunet-service-core_kx.c:1389
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# PING-meddelanden skapade"
 
-#: src/core/gnunet-service-core_kx.c:1428
+#: src/core/gnunet-service-core_kx.c:1429
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1440
+#: src/core/gnunet-service-core_kx.c:1441
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# byte mottogs via TCP"
 
-#: src/core/gnunet-service-core_kx.c:1449
+#: src/core/gnunet-service-core_kx.c:1450
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# sessionnycklar vägrade"
 
-#: src/core/gnunet-service-core_kx.c:1625
+#: src/core/gnunet-service-core_kx.c:1626
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1636
+#: src/core/gnunet-service-core_kx.c:1637
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1640
+#: src/core/gnunet-service-core_kx.c:1641
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# byte kastade via TCP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1718
-#: src/core/gnunet-service-core_kx.c:1745
+#: src/core/gnunet-service-core_kx.c:1719
+#: src/core/gnunet-service-core_kx.c:1746
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1731
+#: src/core/gnunet-service-core_kx.c:1732
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1776
+#: src/core/gnunet-service-core_kx.c:1777
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# byte kastade via UDP (utgående)"
 
-#: src/core/gnunet-service-core_kx.c:1785
+#: src/core/gnunet-service-core_kx.c:1786
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# byte dekrypterade"
@@ -2774,56 +2774,56 @@ msgstr "Kunde inte slå upp \"%s\": %s\n"
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1141
+#: src/fs/fs_api.c:1173
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:1667
+#: src/fs/fs_api.c:1724
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1682
+#: src/fs/fs_api.c:1739
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2366
+#: src/fs/fs_api.c:2468
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2377
+#: src/fs/fs_api.c:2479
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2513 src/fs/fs_api.c:2759
+#: src/fs/fs_api.c:2627 src/fs/fs_api.c:2873
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2531
+#: src/fs/fs_api.c:2645
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_api.c:2547 src/fs/fs_api.c:2567 src/fs/fs_api.c:3058
+#: src/fs/fs_api.c:2661 src/fs/fs_api.c:2681 src/fs/fs_api.c:3180
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2749
+#: src/fs/fs_api.c:2863
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3002
+#: src/fs/fs_api.c:3124
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3097
+#: src/fs/fs_api.c:3219
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2922,17 +2922,17 @@ msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/fs_namespace.c:227
+#: src/fs/fs_namespace.c:233
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/fs/fs_namespace.c:321
+#: src/fs/fs_namespace.c:330
 #, fuzzy, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr "Fel vid %s:%d.\n"
 
-#: src/fs/fs_namespace.c:463
+#: src/fs/fs_namespace.c:472
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Misslyckades att ansluta till gnunetd.\n"
@@ -3162,69 +3162,69 @@ msgstr "Ogiltigt argument: \"%s\"\n"
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:1072 src/fs/fs_uri.c:1099
+#: src/fs/fs_uri.c:1071 src/fs/fs_uri.c:1098
 msgid "No keywords specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/fs/fs_uri.c:1105
+#: src/fs/fs_uri.c:1104
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:230
+#: src/fs/gnunet-auto-share.c:234
 #, fuzzy, c-format
 msgid "Failed to load state: %s\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/fs/gnunet-auto-share.c:278 src/fs/gnunet-auto-share.c:287
-#: src/fs/gnunet-auto-share.c:295
+#: src/fs/gnunet-auto-share.c:286 src/fs/gnunet-auto-share.c:295
+#: src/fs/gnunet-auto-share.c:303
 #, fuzzy, c-format
 msgid "Failed to save state to file %s\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/fs/gnunet-auto-share.c:392
+#: src/fs/gnunet-auto-share.c:400
 #, c-format
 msgid "Publication of `%s' done\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:471
+#: src/fs/gnunet-auto-share.c:479
 #, fuzzy, c-format
 msgid "Publishing `%s'\n"
 msgstr ""
 "\n"
 "Fel vid uppladdning av fil: %s\n"
 
-#: src/fs/gnunet-auto-share.c:483
+#: src/fs/gnunet-auto-share.c:491
 #, fuzzy, c-format
 msgid "Failed to run `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/fs/gnunet-auto-share.c:653
+#: src/fs/gnunet-auto-share.c:661
 #, fuzzy, c-format
 msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Du måste ange en och endast en fil att avindexera.\n"
 
-#: src/fs/gnunet-auto-share.c:703 src/fs/gnunet-publish.c:888
+#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:888
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:710
+#: src/fs/gnunet-auto-share.c:718
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:716 src/fs/gnunet-publish.c:893
+#: src/fs/gnunet-auto-share.c:724 src/fs/gnunet-publish.c:893
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:723 src/fs/gnunet-publish.c:938
+#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:938
 msgid "specify the priority of the content"
 msgstr "ange prioritet för innehållet"
 
-#: src/fs/gnunet-auto-share.c:730 src/fs/gnunet-publish.c:951
+#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:951
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:753
+#: src/fs/gnunet-auto-share.c:761
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
@@ -3649,7 +3649,7 @@ msgstr ""
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/fs/gnunet-service-fs.c:1307 src/hostlist/gnunet-daemon-hostlist.c:355
+#: src/fs/gnunet-service-fs.c:1316 src/hostlist/gnunet-daemon-hostlist.c:343
 #: src/topology/gnunet-daemon-topology.c:1098
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
@@ -3771,41 +3771,41 @@ msgid "# migration stop messages sent"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
 #: src/fs/gnunet-service-fs_indexing.c:130
-#: src/fs/gnunet-service-fs_indexing.c:185
+#: src/fs/gnunet-service-fs_indexing.c:188
 #, fuzzy, c-format
 msgid "Could not open `%s'.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:144
+#: src/fs/gnunet-service-fs_indexing.c:147
 #, fuzzy, c-format
 msgid "Error writing `%s'.\n"
 msgstr "Fel vid skapandet av användare"
 
-#: src/fs/gnunet-service-fs_indexing.c:241
+#: src/fs/gnunet-service-fs_indexing.c:244
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:314
+#: src/fs/gnunet-service-fs_indexing.c:317
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:328
+#: src/fs/gnunet-service-fs_indexing.c:331
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:332
+#: src/fs/gnunet-service-fs_indexing.c:335
 #, fuzzy
 msgid "not indexed"
 msgstr "Avindexering misslyckades."
 
-#: src/fs/gnunet-service-fs_indexing.c:346
+#: src/fs/gnunet-service-fs_indexing.c:349
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "Indexering av data misslyckades vid position %i.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:452
+#: src/fs/gnunet-service-fs_indexing.c:455
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3992,68 +3992,68 @@ msgstr ""
 msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:132
+#: src/gns/gnunet-bcd.c:133
 #, c-format
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:346
+#: src/gns/gnunet-bcd.c:347
 #, fuzzy, c-format
 msgid "Invalid port number %u.  Exiting.\n"
 msgstr "Ogiltiga argument. Avslutar.\n"
 
-#: src/gns/gnunet-bcd.c:351
+#: src/gns/gnunet-bcd.c:352
 #, fuzzy, c-format
 msgid "Businesscard HTTP server starts on %u\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/gns/gnunet-bcd.c:371
+#: src/gns/gnunet-bcd.c:372
 #, fuzzy, c-format
 msgid "Could not start businesscard HTTP server on port %u\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/gns/gnunet-bcd.c:508
+#: src/gns/gnunet-bcd.c:509
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:521
+#: src/gns/gnunet-bcd.c:522
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:213
+#: src/gns/gnunet-dns2gns.c:239
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-dns2gns.c:418
+#: src/gns/gnunet-dns2gns.c:442
 #, fuzzy, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-dns2gns.c:434
+#: src/gns/gnunet-dns2gns.c:458
 #, fuzzy, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Mottog ogiltig \"%s\" begäran (storlek %d)\n"
 
-#: src/gns/gnunet-dns2gns.c:442
+#: src/gns/gnunet-dns2gns.c:466
 #, fuzzy, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Mottog okänd typ av begäran %d vid %s:%d\n"
 
-#: src/gns/gnunet-dns2gns.c:603
+#: src/gns/gnunet-dns2gns.c:627
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Inga nyckelord angivna!\n"
 
-#: src/gns/gnunet-dns2gns.c:752
+#: src/gns/gnunet-dns2gns.c:776
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:758
+#: src/gns/gnunet-dns2gns.c:782
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:775
+#: src/gns/gnunet-dns2gns.c:799
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -4194,44 +4194,44 @@ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2922 src/rest/gnunet-rest-server.c:709
+#: src/gns/gnunet-gns-proxy.c:2922 src/rest/gnunet-rest-server.c:713
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3268
+#: src/gns/gnunet-gns-proxy.c:3271
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3300
+#: src/gns/gnunet-gns-proxy.c:3303
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3386
+#: src/gns/gnunet-gns-proxy.c:3389
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3727
+#: src/gns/gnunet-gns-proxy.c:3730
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/gnunet-gns-proxy.c:3861
+#: src/gns/gnunet-gns-proxy.c:3864
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3866
+#: src/gns/gnunet-gns-proxy.c:3869
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3870
+#: src/gns/gnunet-gns-proxy.c:3873
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3896
+#: src/gns/gnunet-gns-proxy.c:3899
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -4276,51 +4276,51 @@ msgstr ""
 msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:932
+#: src/gns/gnunet-service-gns_resolver.c:938
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1123
+#: src/gns/gnunet-service-gns_resolver.c:1129
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1439
+#: src/gns/gnunet-service-gns_resolver.c:1447
 #, c-format
 msgid "VPN returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1896
+#: src/gns/gnunet-service-gns_resolver.c:1909
 #, c-format
 msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1909
+#: src/gns/gnunet-service-gns_resolver.c:1922
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1952
+#: src/gns/gnunet-service-gns_resolver.c:1965
 #, fuzzy, c-format
 msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr "%d filer hittades i katalog.\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2372
+#: src/gns/gnunet-service-gns_resolver.c:2385
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2395
+#: src/gns/gnunet-service-gns_resolver.c:2408
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2563
+#: src/gns/gnunet-service-gns_resolver.c:2576
 #, c-format
 msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2703
+#: src/gns/gnunet-service-gns_resolver.c:2716
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
@@ -4350,7 +4350,7 @@ msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/gns/plugin_rest_gns.c:443
+#: src/gns/plugin_rest_gns.c:445
 #, fuzzy
 msgid "Gns REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
@@ -4500,31 +4500,31 @@ msgstr ""
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:316
+#: src/hostlist/gnunet-daemon-hostlist.c:306
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:377
+#: src/hostlist/gnunet-daemon-hostlist.c:364
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:383
+#: src/hostlist/gnunet-daemon-hostlist.c:369
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:388
+#: src/hostlist/gnunet-daemon-hostlist.c:374
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:393
+#: src/hostlist/gnunet-daemon-hostlist.c:378
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:409
+#: src/hostlist/gnunet-daemon-hostlist.c:393
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -4548,7 +4548,7 @@ msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:677
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1455
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1459
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -4601,7 +4601,7 @@ msgid "# hostlist downloads initiated"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1144
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1715
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1726
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
@@ -4631,66 +4631,66 @@ msgstr "antal meddelanden att använda per iteration"
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1448
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1452
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1451
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1455
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1502
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1506
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1509
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1513
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1534
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1553
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1545
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1564
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1547
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1558
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1644
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1655
 #: src/transport/plugin_transport_http_client.c:2301
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1673
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1684
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1686
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1697
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1700
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1711
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:172
+#: src/hostlist/gnunet-daemon-hostlist_server.c:173
 #, fuzzy
 msgid "bytes in hostlist"
 msgstr "# byte krypterade"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:198
+#: src/hostlist/gnunet-daemon-hostlist_server.c:199
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:235
-#: src/hostlist/gnunet-daemon-hostlist_server.c:526
+#: src/hostlist/gnunet-daemon-hostlist_server.c:236
+#: src/hostlist/gnunet-daemon-hostlist_server.c:527
 #: src/peerinfo-tool/gnunet-peerinfo.c:379
 #: src/peerinfo-tool/gnunet-peerinfo.c:515
 #: src/topology/gnunet-daemon-topology.c:799
@@ -4698,195 +4698,200 @@ msgstr ""
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:256
+#: src/hostlist/gnunet-daemon-hostlist_server.c:257
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:274
+#: src/hostlist/gnunet-daemon-hostlist_server.c:275
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:376
+#: src/hostlist/gnunet-daemon-hostlist_server.c:377
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:380
+#: src/hostlist/gnunet-daemon-hostlist_server.c:381
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:393
+#: src/hostlist/gnunet-daemon-hostlist_server.c:394
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:398
+#: src/hostlist/gnunet-daemon-hostlist_server.c:399
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:408
+#: src/hostlist/gnunet-daemon-hostlist_server.c:409
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:411
+#: src/hostlist/gnunet-daemon-hostlist_server.c:412
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:417
+#: src/hostlist/gnunet-daemon-hostlist_server.c:418
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:419
+#: src/hostlist/gnunet-daemon-hostlist_server.c:420
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:460
+#: src/hostlist/gnunet-daemon-hostlist_server.c:461
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:673
-#: src/transport/gnunet-service-transport.c:2657
+#: src/hostlist/gnunet-daemon-hostlist_server.c:674
+#: src/transport/gnunet-service-transport.c:2659
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Kunde inte komma åt namnrymdsinformation.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:684
+#: src/hostlist/gnunet-daemon-hostlist_server.c:685
 #, fuzzy, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr "Ogiltiga argument. Avslutar.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:696
+#: src/hostlist/gnunet-daemon-hostlist_server.c:697
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:713
+#: src/hostlist/gnunet-daemon-hostlist_server.c:714
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:728
+#: src/hostlist/gnunet-daemon-hostlist_server.c:729
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:742
+#: src/hostlist/gnunet-daemon-hostlist_server.c:743
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:764
+#: src/hostlist/gnunet-daemon-hostlist_server.c:765
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:785
+#: src/hostlist/gnunet-daemon-hostlist_server.c:786
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "\"%s\" är inte tillgänglig."
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:828
+#: src/hostlist/gnunet-daemon-hostlist_server.c:829
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:193
+#: src/identity/gnunet-identity.c:209
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/identity/gnunet-identity.c:233
+#: src/identity/gnunet-identity.c:250
 #, fuzzy, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/identity/gnunet-identity.c:391
+#: src/identity/gnunet-identity.c:445
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:396
+#: src/identity/gnunet-identity.c:450
 msgid "delete ego NAME "
 msgstr ""
 
-#: src/identity/gnunet-identity.c:400
+#: src/identity/gnunet-identity.c:455
+msgid ""
+"set the private key for the identity to PRIVATE_KEY (use together with -C)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:459
 msgid "display all egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:404
+#: src/identity/gnunet-identity.c:463
 msgid "reduce output"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:411
+#: src/identity/gnunet-identity.c:470
 msgid ""
 "set default identity to NAME for a subsystem SUBSYSTEM (use together with -"
 "s) or restrict results to NAME (use together with -d)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:415
+#: src/identity/gnunet-identity.c:474
 msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:419
+#: src/identity/gnunet-identity.c:478
 msgid "display private keys as well"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:426
+#: src/identity/gnunet-identity.c:485
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:438
+#: src/identity/gnunet-identity.c:500
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:484
+#: src/identity/gnunet-service-identity.c:503
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:507
+#: src/identity/gnunet-service-identity.c:528
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:597
-#: src/identity/gnunet-service-identity.c:871
-#: src/identity/gnunet-service-identity.c:991
+#: src/identity/gnunet-service-identity.c:621
+#: src/identity/gnunet-service-identity.c:898
+#: src/identity/gnunet-service-identity.c:1018
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/identity/gnunet-service-identity.c:607
+#: src/identity/gnunet-service-identity.c:631
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:700
+#: src/identity/gnunet-service-identity.c:726
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:847
+#: src/identity/gnunet-service-identity.c:874
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:889
-#: src/identity/gnunet-service-identity.c:1009
+#: src/identity/gnunet-service-identity.c:916
+#: src/identity/gnunet-service-identity.c:1035
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:1043
+#: src/identity/gnunet-service-identity.c:1072
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/identity/gnunet-service-identity.c:1099
+#: src/identity/gnunet-service-identity.c:1130
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/identity/gnunet-service-identity.c:1108
+#: src/identity/gnunet-service-identity.c:1139
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/identity/plugin_rest_identity.c:1359
+#: src/identity/plugin_rest_identity.c:1406
 #, fuzzy
 msgid "Identity REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
@@ -4936,7 +4941,7 @@ msgstr "Ogiltigt argument: \"%s\"\n"
 msgid "You must specify a name\n"
 msgstr "Du måste ange en mottagare!\n"
 
-#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:1608
+#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:1639
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -4945,7 +4950,7 @@ msgstr ""
 msgid "specifies the public key of the zone to look in"
 msgstr "ange prioritet för innehållet"
 
-#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:1669
+#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:1700
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet-konfiguration"
@@ -5059,9 +5064,10 @@ msgstr "Misslyckades att skicka HTTP-begäran till värd \"%s\": %s\n"
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1014 src/namestore/gnunet-namestore.c:1047
-#: src/namestore/gnunet-namestore.c:1057 src/namestore/gnunet-namestore.c:1075
-#: src/namestore/gnunet-namestore.c:1096 src/namestore/gnunet-namestore.c:1123
+#: src/namestore/gnunet-namestore.c:1014 src/namestore/gnunet-namestore.c:1065
+#: src/namestore/gnunet-namestore.c:1075 src/namestore/gnunet-namestore.c:1104
+#: src/namestore/gnunet-namestore.c:1125 src/namestore/gnunet-namestore.c:1152
+#: src/namestore/gnunet-namestore.c:1228
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
@@ -5070,52 +5076,58 @@ msgstr "Konfigurationsfil \"%s\" skapad.\n"
 msgid "replace"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1049 src/namestore/gnunet-namestore.c:1059
-#: src/namestore/gnunet-namestore.c:1077 src/namestore/gnunet-namestore.c:1098
+#: src/namestore/gnunet-namestore.c:1045
+#, fuzzy, c-format
+msgid "Invalid nick `%s'\n"
+msgstr "Ogiltiga argument: "
+
+#: src/namestore/gnunet-namestore.c:1067 src/namestore/gnunet-namestore.c:1077
+#: src/namestore/gnunet-namestore.c:1106 src/namestore/gnunet-namestore.c:1127
+#: src/namestore/gnunet-namestore.c:1230
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1067
+#: src/namestore/gnunet-namestore.c:1085
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/namestore/gnunet-namestore.c:1086
+#: src/namestore/gnunet-namestore.c:1095
+#, c-format
+msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1115
 #, fuzzy, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr "%s: symbolvärde \"%s\" ogiltigt för %s\n"
 
-#: src/namestore/gnunet-namestore.c:1105
+#: src/namestore/gnunet-namestore.c:1134 src/namestore/gnunet-namestore.c:1237
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:1125
+#: src/namestore/gnunet-namestore.c:1154
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1168
+#: src/namestore/gnunet-namestore.c:1197
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:1191
+#: src/namestore/gnunet-namestore.c:1220
 #: src/peerinfo-tool/gnunet-peerinfo.c:736
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Ogiltiga argument: "
 
-#: src/namestore/gnunet-namestore.c:1217
-#, fuzzy, c-format
-msgid "Invalid nick `%s'\n"
-msgstr "Ogiltiga argument: "
-
-#: src/namestore/gnunet-namestore.c:1259
+#: src/namestore/gnunet-namestore.c:1290
 #, c-format
 msgid "Label `%s' contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1309
+#: src/namestore/gnunet-namestore.c:1340
 #, c-format
 msgid ""
 "No default identity configured for `namestore' subsystem\n"
@@ -5123,167 +5135,167 @@ msgid ""
 "Run gnunet-identity -d to get a list of choices for $NAME\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1374
+#: src/namestore/gnunet-namestore.c:1405
 #, fuzzy, c-format
 msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr "Onödiga argument (ignorerade).\n"
 
-#: src/namestore/gnunet-namestore.c:1403
+#: src/namestore/gnunet-namestore.c:1434
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "Kunde inte ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:1450
+#: src/namestore/gnunet-namestore.c:1481
 msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1462
+#: src/namestore/gnunet-namestore.c:1493
 #, c-format
 msgid "Invalid expiration time `%s' (must be without unit)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1474 src/namestore/gnunet-namestore.c:1490
-#: src/namestore/gnunet-namestore.c:1507
+#: src/namestore/gnunet-namestore.c:1505 src/namestore/gnunet-namestore.c:1521
+#: src/namestore/gnunet-namestore.c:1538
 #, fuzzy, c-format
 msgid "Missing entries in record line `%s'.\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/namestore/gnunet-namestore.c:1482
+#: src/namestore/gnunet-namestore.c:1513
 #, fuzzy, c-format
 msgid "Unknown record type `%s'\n"
 msgstr "Okänd operation \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:1520
+#: src/namestore/gnunet-namestore.c:1551
 #, fuzzy, c-format
 msgid "Invalid record data for type %s: `%s'.\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/namestore/gnunet-namestore.c:1577
+#: src/namestore/gnunet-namestore.c:1608
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1580
+#: src/namestore/gnunet-namestore.c:1611
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1584
+#: src/namestore/gnunet-namestore.c:1615
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1591
+#: src/namestore/gnunet-namestore.c:1622
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1597
+#: src/namestore/gnunet-namestore.c:1628
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/namestore/gnunet-namestore.c:1602
+#: src/namestore/gnunet-namestore.c:1633
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore.c:1614
+#: src/namestore/gnunet-namestore.c:1645
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "Skriv ut information om GNUnets motparter."
 
-#: src/namestore/gnunet-namestore.c:1621
+#: src/namestore/gnunet-namestore.c:1652
 msgid ""
 "set record set to values given by (possibly multiple) RECORDLINES; can be "
 "specified multiple times"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1627
+#: src/namestore/gnunet-namestore.c:1658
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1632
+#: src/namestore/gnunet-namestore.c:1663
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1638
+#: src/namestore/gnunet-namestore.c:1669
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1642
+#: src/namestore/gnunet-namestore.c:1673
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1648
+#: src/namestore/gnunet-namestore.c:1679
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1654
+#: src/namestore/gnunet-namestore.c:1685
 #, fuzzy
 msgid "name of the ego controlling the zone"
 msgstr "Visa värde av alternativet"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:551
+#: src/namestore/gnunet-namestore-fcfsd.c:552
 #, fuzzy, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "Kommando \"%s\" stöds ej.  Avbryter.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:578
+#: src/namestore/gnunet-namestore-fcfsd.c:579
 #, fuzzy, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:599
+#: src/namestore/gnunet-namestore-fcfsd.c:600
 msgid "Error when mapping zone to name\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:631
+#: src/namestore/gnunet-namestore-fcfsd.c:632
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:693
+#: src/namestore/gnunet-namestore-fcfsd.c:694
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:783
+#: src/namestore/gnunet-namestore-fcfsd.c:784
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:802
+#: src/namestore/gnunet-namestore-fcfsd.c:803
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:839
+#: src/namestore/gnunet-namestore-fcfsd.c:840
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:848
+#: src/namestore/gnunet-namestore-fcfsd.c:849
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1083
+#: src/namestore/gnunet-namestore-fcfsd.c:1084
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1114
+#: src/namestore/gnunet-namestore-fcfsd.c:1115
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1162
+#: src/namestore/gnunet-namestore-fcfsd.c:1163
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1189
+#: src/namestore/gnunet-namestore-fcfsd.c:1190
 msgid "name of the zone that is to be managed by FCFSD"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1209
+#: src/namestore/gnunet-namestore-fcfsd.c:1210
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
@@ -5318,7 +5330,7 @@ msgstr ""
 msgid "Flat file database running\n"
 msgstr ""
 
-#: src/namestore/plugin_rest_namestore.c:925
+#: src/namestore/plugin_rest_namestore.c:1093
 #, fuzzy
 msgid "Namestore REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
@@ -5640,8 +5652,8 @@ msgstr ""
 msgid "Measure quality and performance of the NSE service."
 msgstr "Kan inte tillgå tjänsten"
 
-#: src/nse/gnunet-service-nse.c:1437
-#: src/revocation/gnunet-service-revocation.c:846 src/util/gnunet-scrypt.c:247
+#: src/nse/gnunet-service-nse.c:1438
+#: src/revocation/gnunet-service-revocation.c:842 src/util/gnunet-scrypt.c:250
 msgid "Value is too large.\n"
 msgstr ""
 
@@ -5711,7 +5723,7 @@ msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:292
-#: src/peerinfo-tool/plugin_rest_peerinfo.c:499
+#: src/peerinfo-tool/plugin_rest_peerinfo.c:501
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
@@ -5791,7 +5803,7 @@ msgstr "Testar transport(er) %s\n"
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/peerinfo-tool/plugin_rest_peerinfo.c:795
+#: src/peerinfo-tool/plugin_rest_peerinfo.c:797
 #, fuzzy
 msgid "Peerinfo REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
@@ -5907,85 +5919,97 @@ msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:617
+#: src/reclaim/gnunet-reclaim.c:799
 #, fuzzy, c-format
 msgid "Ego is required\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/reclaim/gnunet-reclaim.c:624
+#: src/reclaim/gnunet-reclaim.c:806
 #, c-format
 msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:631
+#: src/reclaim/gnunet-reclaim.c:813
 #, fuzzy, c-format
 msgid "Requesting party key is required!\n"
 msgstr "%s: flagga \"%s\" är tvetydig\n"
 
-#: src/reclaim/gnunet-reclaim.c:649
+#: src/reclaim/gnunet-reclaim.c:831
 msgid "Add an attribute NAME"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:654
+#: src/reclaim/gnunet-reclaim.c:836
 msgid "Delete the attribute with ID"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:659
+#: src/reclaim/gnunet-reclaim.c:841
 msgid "The attribute VALUE"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:664
+#: src/reclaim/gnunet-reclaim.c:846
 #, fuzzy
 msgid "The EGO to use"
 msgstr "meddelandestorlek"
 
-#: src/reclaim/gnunet-reclaim.c:670
+#: src/reclaim/gnunet-reclaim.c:852
 msgid "Specify the relying party for issue"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:674
+#: src/reclaim/gnunet-reclaim.c:856
 msgid "List attributes for EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:681
+#: src/reclaim/gnunet-reclaim.c:860
+msgid "List attestations for EGO"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:866
+msgid "Attestation to use for attribute"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:871
+msgid "Attestation name"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:877
 msgid "Issue a ticket for a set of attributes separated by comma"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:686
+#: src/reclaim/gnunet-reclaim.c:882
 msgid "Consume a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:691
+#: src/reclaim/gnunet-reclaim.c:887
 msgid "Revoke a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:696
+#: src/reclaim/gnunet-reclaim.c:892
 msgid "Type of attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:700
+#: src/reclaim/gnunet-reclaim.c:896
 msgid "List tickets of ego"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:706
+#: src/reclaim/gnunet-reclaim.c:902
 msgid "Expiration interval of the attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:714
+#: src/reclaim/gnunet-reclaim.c:910
 msgid "re:claimID command line tool"
 msgstr ""
 
-#: src/reclaim/plugin_rest_openid_connect.c:2340
+#: src/reclaim/plugin_rest_openid_connect.c:2481
 #, fuzzy
 msgid "OpenID Connect REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
 
-#: src/reclaim/plugin_rest_reclaim.c:1899
+#: src/reclaim/plugin_rest_reclaim.c:1476
 #, fuzzy
 msgid "Identity Provider REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
 
-#: src/reclaim/reclaim_api.c:436
+#: src/reclaim/reclaim_api.c:540
 #, fuzzy
 msgid "failed to store record\n"
 msgstr "Misslyckades att starta samling.\n"
@@ -6080,12 +6104,12 @@ msgstr "\"%s\" är inte en fil.\n"
 msgid "Search string `%s' is too long!\n"
 msgstr "\"%s\" är inte en fil.\n"
 
-#: src/rest/gnunet-rest-server.c:1047
+#: src/rest/gnunet-rest-server.c:1051
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "Spåra GNUnets nätverkstopologi."
 
-#: src/rest/plugin_rest_config.c:401
+#: src/rest/plugin_rest_config.c:402
 #, fuzzy
 msgid "CONFIG REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
@@ -6095,140 +6119,158 @@ msgstr " Anslutning misslyckades\n"
 msgid "COPYING REST API initialized\n"
 msgstr " Anslutning misslyckades\n"
 
-#: src/revocation/gnunet-revocation.c:127
+#: src/revocation/gnunet-revocation.c:114
+#, fuzzy
+msgid "Shutting down...\n"
+msgstr "Startade samling \"%s\".\n"
+
+#: src/revocation/gnunet-revocation.c:146
 #, fuzzy, c-format
 msgid "Key `%s' is valid\n"
 msgstr "Formatet på pseudonym \"%s\" är ogiltig.\n"
 
-#: src/revocation/gnunet-revocation.c:131
+#: src/revocation/gnunet-revocation.c:150
 #, fuzzy, c-format
 msgid "Key `%s' has been revoked\n"
 msgstr "Tjänst borttagen.\n"
 
-#: src/revocation/gnunet-revocation.c:135
+#: src/revocation/gnunet-revocation.c:154
 #, fuzzy
 msgid "Internal error\n"
 msgstr "Okänt fel.\n"
 
-#: src/revocation/gnunet-revocation.c:161
+#: src/revocation/gnunet-revocation.c:180
 #, c-format
 msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:164
+#: src/revocation/gnunet-revocation.c:183
 #, fuzzy
 msgid "Revocation failed (!)\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/revocation/gnunet-revocation.c:170
+#: src/revocation/gnunet-revocation.c:189
 #, c-format
 msgid "Key for ego `%s' has been successfully revoked\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:173
+#: src/revocation/gnunet-revocation.c:192
 msgid "Revocation successful.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:179
+#: src/revocation/gnunet-revocation.c:198
 msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:312
+#: src/revocation/gnunet-revocation.c:251
+msgid "Cancelling calculation.\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:296
 #, c-format
 msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:338
+#: src/revocation/gnunet-revocation.c:335
 #, fuzzy, c-format
 msgid "Ego `%s' not found.\n"
 msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
 
-#: src/revocation/gnunet-revocation.c:351
+#: src/revocation/gnunet-revocation.c:349
 #, c-format
 msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:368
+#: src/revocation/gnunet-revocation.c:359
 msgid "Revocation certificate ready\n"
 msgstr ""
 
+#: src/revocation/gnunet-revocation.c:371
+msgid "Continuing calculation where left off...\n"
+msgstr ""
+
 #: src/revocation/gnunet-revocation.c:378
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:409
+#: src/revocation/gnunet-revocation.c:416
 #, fuzzy, c-format
 msgid "Public key `%s' malformed\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/revocation/gnunet-revocation.c:419
+#: src/revocation/gnunet-revocation.c:426
 msgid ""
 "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:438
+#: src/revocation/gnunet-revocation.c:456
 #, fuzzy
 msgid "No filename to store revocation certificate given.\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/revocation/gnunet-revocation.c:451
+#: src/revocation/gnunet-revocation.c:471
 #, fuzzy, c-format
 msgid "Failed to read revocation certificate from `%s'\n"
 msgstr "Misslyckades att läsa kompislista från \"%s\"\n"
 
-#: src/revocation/gnunet-revocation.c:471
+#: src/revocation/gnunet-revocation.c:493
 #, fuzzy
 msgid "No action specified. Nothing to do.\n"
 msgstr "Inget tabellnamn angivet, använder \"%s\".\n"
 
-#: src/revocation/gnunet-revocation.c:490
+#: src/revocation/gnunet-revocation.c:512
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:498
+#: src/revocation/gnunet-revocation.c:520
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:505
+#: src/revocation/gnunet-revocation.c:527
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:512
+#: src/revocation/gnunet-revocation.c:534
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:458
+#: src/revocation/gnunet-revocation.c:540
+#, fuzzy
+msgid "number of epochs to calculate for"
+msgstr "antal iterationer"
+
+#: src/revocation/gnunet-service-revocation.c:454
 #, fuzzy
 msgid "# unsupported revocations received via set union"
 msgstr "# byte mottogs via TCP"
 
-#: src/revocation/gnunet-service-revocation.c:468
+#: src/revocation/gnunet-service-revocation.c:464
 #, fuzzy
 msgid "# revocation messages received via set union"
 msgstr "# krypterade PONG-meddelanden mottagna"
 
-#: src/revocation/gnunet-service-revocation.c:474
+#: src/revocation/gnunet-service-revocation.c:470
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:478
+#: src/revocation/gnunet-service-revocation.c:474
 #, fuzzy
 msgid "# revocation set unions failed"
 msgstr "# sessionsnycklar accepterade"
 
-#: src/revocation/gnunet-service-revocation.c:490
+#: src/revocation/gnunet-service-revocation.c:486
 #, fuzzy
 msgid "# revocation set unions completed"
 msgstr "# klartext PONG-meddelanden mottagna"
 
-#: src/revocation/gnunet-service-revocation.c:530
+#: src/revocation/gnunet-service-revocation.c:526
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:871
+#: src/revocation/gnunet-service-revocation.c:881
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "Kunde inte ansluta till gnunetd.\n"
@@ -6418,93 +6460,93 @@ msgstr "Ladda ner filer från GNUnet."
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "Ladda ner filer från GNUnet."
 
-#: src/statistics/gnunet-statistics.c:409
-#: src/statistics/gnunet-statistics.c:448
+#: src/statistics/gnunet-statistics.c:413
+#: src/statistics/gnunet-statistics.c:455
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/statistics/gnunet-statistics.c:412
-#: src/statistics/gnunet-statistics.c:451
+#: src/statistics/gnunet-statistics.c:416
+#: src/statistics/gnunet-statistics.c:458
 #, fuzzy, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "Misslyckades att binda till UDP-port %d.\n"
 
-#: src/statistics/gnunet-statistics.c:526
+#: src/statistics/gnunet-statistics.c:532
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:532
+#: src/statistics/gnunet-statistics.c:538
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:571
+#: src/statistics/gnunet-statistics.c:577
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:583
+#: src/statistics/gnunet-statistics.c:589
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Misslyckades att initiera tjänsten \"%s\".\n"
 
-#: src/statistics/gnunet-statistics.c:710
+#: src/statistics/gnunet-statistics.c:725
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "Ogiltigt argument: \"%s\"\n"
 
-#: src/statistics/gnunet-statistics.c:726
+#: src/statistics/gnunet-statistics.c:742
 #, fuzzy, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "Kan inte ansluta till %u.%u.%u.%u:%u: %s\n"
 
-#: src/statistics/gnunet-statistics.c:735
+#: src/statistics/gnunet-statistics.c:751
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:764
+#: src/statistics/gnunet-statistics.c:783
 #, c-format
 msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:797
+#: src/statistics/gnunet-statistics.c:816
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:803
+#: src/statistics/gnunet-statistics.c:821
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:810
+#: src/statistics/gnunet-statistics.c:827
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:816
+#: src/statistics/gnunet-statistics.c:832
 msgid "use as csv separator"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:823
+#: src/statistics/gnunet-statistics.c:838
 msgid "path to the folder containing the testbed data"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:829
+#: src/statistics/gnunet-statistics.c:843
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:834
+#: src/statistics/gnunet-statistics.c:847
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:840
+#: src/statistics/gnunet-statistics.c:852
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:846
+#: src/statistics/gnunet-statistics.c:857
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:861
+#: src/statistics/gnunet-statistics.c:874
 msgid "Print statistics about GNUnet operations."
 msgstr "Skriv ut statistik om GNUnet-operationer."
 
@@ -6596,7 +6638,7 @@ msgid ""
 msgstr ""
 
 #: src/testbed/gnunet-daemon-testbed-underlay.c:234 src/testing/list-keys.c:47
-#: src/testing/testing.c:284 src/util/gnunet-ecc.c:292
+#: src/testing/testing.c:284 src/util/gnunet-ecc.c:318
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
@@ -6983,40 +7025,40 @@ msgstr "# krypterade PONG-meddelanden mottagna"
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:2227
-#: src/transport/gnunet-communicator-udp.c:2712
-#: src/transport/gnunet-service-tng.c:10024
-#: src/transport/gnunet-service-transport.c:2627
+#: src/transport/gnunet-communicator-tcp.c:2458
+#: src/transport/gnunet-communicator-udp.c:2825
+#: src/transport/gnunet-service-tng.c:10027
+#: src/transport/gnunet-service-transport.c:2624
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/transport/gnunet-communicator-tcp.c:2285
+#: src/transport/gnunet-communicator-tcp.c:2754
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:2784
+#: src/transport/gnunet-communicator-udp.c:2897
 msgid "GNUnet UDP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:782
+#: src/transport/gnunet-communicator-unix.c:788
 #, fuzzy
 msgid ""
 "Maximum number of UNIX connections exceeded, dropping incoming message\n"
 msgstr "Maximalt antal chattklienter uppnått.\n"
 
-#: src/transport/gnunet-communicator-unix.c:1009
+#: src/transport/gnunet-communicator-unix.c:1015
 #, fuzzy
 msgid "UNIX communicator is lacking key configuration settings. Exiting.\n"
 msgstr "GNUnet-konfiguration"
 
-#: src/transport/gnunet-communicator-unix.c:1054
+#: src/transport/gnunet-communicator-unix.c:1060
 #: src/transport/plugin_transport_unix.c:1383
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/gnunet-communicator-unix.c:1132
+#: src/transport/gnunet-communicator-unix.c:1138
 msgid "GNUnet UNIX domain socket communicator"
 msgstr ""
 
@@ -7028,41 +7070,41 @@ msgstr ""
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:791
+#: src/transport/gnunet-service-transport.c:794
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1474
+#: src/transport/gnunet-service-transport.c:1477
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer"
 msgstr "Nätverksannonsering avstängd i konfigurationen!\n"
 
-#: src/transport/gnunet-service-transport.c:1619
+#: src/transport/gnunet-service-transport.c:1622
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# byte krypterade"
 
-#: src/transport/gnunet-service-transport.c:1709
+#: src/transport/gnunet-service-transport.c:1712
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# byte dekrypterade"
 
-#: src/transport/gnunet-service-transport.c:2013
-#: src/transport/gnunet-service-transport.c:2452
+#: src/transport/gnunet-service-transport.c:2016
+#: src/transport/gnunet-service-transport.c:2450
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2456
+#: src/transport/gnunet-service-transport.c:2454
 #, fuzzy, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/transport/gnunet-service-transport.c:2551
+#: src/transport/gnunet-service-transport.c:2549
 #, fuzzy, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/transport/gnunet-service-transport.c:2560
+#: src/transport/gnunet-service-transport.c:2558
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
@@ -7318,7 +7360,7 @@ msgstr ""
 #: src/transport/gnunet-service-transport_validation.c:489
 #: src/transport/gnunet-service-transport_validation.c:679
 #: src/transport/gnunet-service-transport_validation.c:1000
-#: src/transport/gnunet-service-transport_validation.c:1626
+#: src/transport/gnunet-service-transport_validation.c:1627
 msgid "# validations running"
 msgstr ""
 
@@ -7373,32 +7415,32 @@ msgid ""
 "having this address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1278
+#: src/transport/gnunet-service-transport_validation.c:1279
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "Kunde inte skapa namnrymd \"%s\" (existerar?).\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1330
+#: src/transport/gnunet-service-transport_validation.c:1331
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1339
+#: src/transport/gnunet-service-transport_validation.c:1340
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1514
+#: src/transport/gnunet-service-transport_validation.c:1515
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1532
+#: src/transport/gnunet-service-transport_validation.c:1533
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1589
+#: src/transport/gnunet-service-transport_validation.c:1590
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1644
+#: src/transport/gnunet-service-transport_validation.c:1645
 #, fuzzy
 msgid "# HELLOs given to peerinfo"
 msgstr "Meddelande mottaget från klient är ogiltig.\n"
@@ -8028,17 +8070,17 @@ msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
 # drive = hard drive ?
-#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1397
+#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1396
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "\"%s\" misslyckades för enhet %s: %u\n"
 
-#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1409
+#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1408
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
 
-#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1416
+#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1415
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "\"%s\" misslyckades för port %d: %s. Körs verkligen gnunetd?\n"
@@ -8050,7 +8092,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:345 src/util/service.c:834
+#: src/transport/tcp_service_legacy.c:345 src/util/service.c:833
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "Okänd operation \"%s\"\n"
@@ -8060,23 +8102,23 @@ msgstr "Okänd operation \"%s\"\n"
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:410 src/util/service.c:947
+#: src/transport/tcp_service_legacy.c:410 src/util/service.c:946
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:451 src/util/service.c:988
+#: src/transport/tcp_service_legacy.c:451 src/util/service.c:987
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:890
-#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1477
+#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1476
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1501
+#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1500
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -8091,29 +8133,29 @@ msgstr "Fel vid %s:%d.\n"
 msgid "Service `%s' runs at %s\n"
 msgstr "Motpart \"%s\" med pålitlighet %8u och adress \"%s\"\n"
 
-#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1747
+#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1746
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1752
+#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1751
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1757
+#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1756
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1253 src/util/disk.c:1177
-#: src/util/service.c:1638
+#: src/transport/tcp_service_legacy.c:1253 src/util/disk.c:1176
+#: src/util/service.c:1637
 #, fuzzy, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Kan inte öppna konfigurationsfil \"%s\".\n"
 
-#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1640
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1639
 msgid "No such user"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1654
+#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1653
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Kan inte ändra användare/grupp till \"%s\": %s\n"
@@ -8123,13 +8165,13 @@ msgid "do daemonize (detach from terminal)"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:1397
-#: src/transport/transport-testing2.c:906 src/util/service.c:2070
-#: src/util/service.c:2082
+#: src/transport/transport-testing2.c:1061 src/util/service.c:2072
+#: src/util/service.c:2084
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 
-#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2092
+#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2094
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Kunde inte spara konfigurationsfil \"%s\":"
@@ -8139,40 +8181,90 @@ msgstr "Kunde inte spara konfigurationsfil \"%s\":"
 msgid "Could not access configuration file `%s'\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 
-#: src/transport/transport_api2_communication.c:704
+#: src/transport/transport_api2_communication.c:743
 msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/util/bio.c:177 src/util/bio.c:185
+#: src/util/bio.c:227 src/util/bio.c:235
 #, fuzzy, c-format
-msgid "Error reading `%s': %s"
+msgid "Error reading `%s' from file: %s"
 msgstr "Fel vid skapandet av användare"
 
-#: src/util/bio.c:187
+#: src/util/bio.c:237
 #, fuzzy
 msgid "End of file"
 msgstr "Läs in en konfigurationsfil"
 
-#: src/util/bio.c:244
+#: src/util/bio.c:266
+#, fuzzy, c-format
+msgid "Error while reading `%s' from buffer: %s"
+msgstr "Fel vid nedladdning: %s\n"
+
+#: src/util/bio.c:268
+msgid "Not enough data left"
+msgstr ""
+
+#: src/util/bio.c:308
+#, fuzzy, c-format
+msgid "Invalid handle type while reading `%s'"
+msgstr "Ogiltiga kommandoradsargument:\n"
+
+#: src/util/bio.c:335 src/util/bio.c:838
+msgid "string length"
+msgstr ""
+
+#: src/util/bio.c:341
+#, fuzzy, c-format
+msgid "%s (while reading `%s')"
+msgstr "Fel vid nedladdning: %s\n"
+
+#: src/util/bio.c:346
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:255
+#: src/util/bio.c:359
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:303
-#, c-format
-msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
+#: src/util/bio.c:398 src/util/bio.c:863 src/util/bio.c:880
+msgid "metadata length"
 msgstr ""
 
-#: src/util/bio.c:319
+#: src/util/bio.c:410
 #, c-format
-msgid "Metadata `%s' failed to deserialize"
+msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
 msgstr ""
 
+#: src/util/bio.c:426
+#, fuzzy, c-format
+msgid "Failed to deserialize metadata `%s'"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
+#: src/util/bio.c:667
+msgid "Unable to flush buffer to file"
+msgstr ""
+
+#: src/util/bio.c:729 src/util/bio.c:750
+#, fuzzy, c-format
+msgid "Error while writing `%s' to file: %s"
+msgstr "Fel vid nedladdning: %s\n"
+
+#: src/util/bio.c:731
+msgid "No associated file"
+msgstr ""
+
+#: src/util/bio.c:815
+#, fuzzy, c-format
+msgid "Invalid handle type while writing `%s'"
+msgstr "Ogiltigt format för IP: \"%s\"\n"
+
+#: src/util/bio.c:875
+#, fuzzy, c-format
+msgid "Failed to serialize metadata `%s'"
+msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
+
 #: src/util/client.c:747 src/util/client.c:937
 msgid "not a valid filename"
 msgstr ""
@@ -8182,27 +8274,27 @@ msgstr ""
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:259 src/util/common_logging.c:1112
+#: src/util/common_logging.c:259 src/util/common_logging.c:1114
 msgid "DEBUG"
 msgstr "FELSÖKNING"
 
-#: src/util/common_logging.c:261 src/util/common_logging.c:1110
+#: src/util/common_logging.c:261 src/util/common_logging.c:1112
 msgid "INFO"
 msgstr "INFO"
 
-#: src/util/common_logging.c:263 src/util/common_logging.c:1108
+#: src/util/common_logging.c:263 src/util/common_logging.c:1110
 msgid "MESSAGE"
 msgstr "MEDDELANDE"
 
-#: src/util/common_logging.c:265 src/util/common_logging.c:1106
+#: src/util/common_logging.c:265 src/util/common_logging.c:1108
 msgid "WARNING"
 msgstr "VARNING"
 
-#: src/util/common_logging.c:267 src/util/common_logging.c:1104
+#: src/util/common_logging.c:267 src/util/common_logging.c:1106
 msgid "ERROR"
 msgstr "FEL"
 
-#: src/util/common_logging.c:269 src/util/common_logging.c:1114
+#: src/util/common_logging.c:269 src/util/common_logging.c:1116
 msgid "NONE"
 msgstr ""
 
@@ -8211,29 +8303,29 @@ msgstr ""
 msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:902
+#: src/util/common_logging.c:904
 #, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr ""
 
-#: src/util/common_logging.c:1115
+#: src/util/common_logging.c:1117
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1396
+#: src/util/common_logging.c:1398
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1441
+#: src/util/common_logging.c:1443
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1460
+#: src/util/common_logging.c:1462
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "Konfigurationsfil \"%s\" skapad.\n"
 
-#: src/util/common_logging.c:1483
+#: src/util/common_logging.c:1485
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8285,42 +8377,17 @@ msgid ""
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:705
+#: src/util/crypto_ecc.c:663
 #, fuzzy, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/crypto_ecc.c:822
+#: src/util/crypto_ecc.c:791
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/crypto_ecc_setup.c:136 src/util/crypto_ecc_setup.c:178
-#: src/util/crypto_ecc_setup.c:318 src/util/crypto_ecc_setup.c:360
-#, fuzzy, c-format
-msgid "Could not acquire lock on file `%s': %s...\n"
-msgstr "Kunde inte slå upp \"%s\": %s\n"
-
-#: src/util/crypto_ecc_setup.c:142 src/util/crypto_ecc_setup.c:324
-#, fuzzy
-msgid "Creating a new private key.  This may take a while.\n"
-msgstr "Skapar ny värdnyckel (det här kan ta en stund).\n"
-
-#: src/util/crypto_ecc_setup.c:184 src/util/crypto_ecc_setup.c:366
-msgid "This may be ok if someone is currently generating a private key.\n"
-msgstr ""
-
-#: src/util/crypto_ecc_setup.c:220 src/util/crypto_ecc_setup.c:402
-#, c-format
-msgid ""
-"When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
-msgstr ""
-
-#: src/util/crypto_ecc_setup.c:225 src/util/crypto_ecc_setup.c:407
-msgid "This may be ok if someone is currently generating a key.\n"
-msgstr ""
-
-#: src/util/crypto_ecc_setup.c:469
+#: src/util/crypto_ecc_setup.c:369
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
@@ -8330,17 +8397,17 @@ msgstr "Kunde inte tolka konfigurationsfil \"%s\".\n"
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt har inte den förväntande versionen (version %s krävs).\n"
 
-#: src/util/crypto_rsa.c:956
+#: src/util/crypto_rsa.c:959
 #, fuzzy, c-format
 msgid "RSA signing failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/crypto_rsa.c:1314
+#: src/util/crypto_rsa.c:1318
 #, fuzzy, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "\"%s\" misslyckades vid %s:%d med fel: \"%s\".\n"
 
-#: src/util/disk.c:941
+#: src/util/disk.c:940
 #, fuzzy, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "\"%s\" förväntade att \"%s\" skulle vara en katalog!\n"
@@ -8473,41 +8540,52 @@ msgstr ""
 msgid "use configuration file FILENAME"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
 
-#: src/util/getopt_helpers.c:568 src/util/getopt_helpers.c:634
-#: src/util/getopt_helpers.c:835 src/util/getopt_helpers.c:900
+#: src/util/getopt_helpers.c:568 src/util/getopt_helpers.c:859
+#: src/util/getopt_helpers.c:924
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
 
-#: src/util/getopt_helpers.c:659
+#: src/util/getopt_helpers.c:649
+#, fuzzy, c-format
+msgid ""
+"You must pass a relative time (optionally with sign) to the `%s' option.\n"
+msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
+
+#: src/util/getopt_helpers.c:656
+#, c-format
+msgid "Value given for time travel `%s' option is too big.\n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:683
 msgid "[+/-]MICROSECONDS"
 msgstr ""
 
-#: src/util/getopt_helpers.c:661
+#: src/util/getopt_helpers.c:685
 msgid "modify system time by given offset (for debugging/testing only)"
 msgstr ""
 
-#: src/util/getopt_helpers.c:696
+#: src/util/getopt_helpers.c:720
 #, fuzzy, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
 
-#: src/util/getopt_helpers.c:761
+#: src/util/getopt_helpers.c:785
 #, fuzzy, c-format
 msgid "You must pass absolute time to the `%s' option.\n"
 msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
 
-#: src/util/getopt_helpers.c:828
+#: src/util/getopt_helpers.c:852
 #, c-format
 msgid "Your input for the '%s' option has to be a non negative number\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:907
+#: src/util/getopt_helpers.c:931
 #, fuzzy, c-format
 msgid "You must pass a number below %u to the `%s' option.\n"
 msgstr "Du måste skicka med ett nummer till flaggan \"%s\".\n"
 
-#: src/util/getopt_helpers.c:994
+#: src/util/getopt_helpers.c:1018
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
@@ -8582,7 +8660,7 @@ msgstr ""
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:175
+#: src/util/gnunet-ecc.c:177
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8603,54 +8681,54 @@ msgid ""
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:277
+#: src/util/gnunet-ecc.c:303
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr "\"%s\" misslyckades: tabell hittades inte!\n"
 
-#: src/util/gnunet-ecc.c:287
+#: src/util/gnunet-ecc.c:313
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr "antal meddelanden att använda per iteration"
 
-#: src/util/gnunet-ecc.c:307
+#: src/util/gnunet-ecc.c:333
 #, fuzzy, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr "Kunde inte skapa värdnyckel!\n"
 
-#: src/util/gnunet-ecc.c:361
+#: src/util/gnunet-ecc.c:387
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:425
+#: src/util/gnunet-ecc.c:451
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:431
+#: src/util/gnunet-ecc.c:457
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:437
+#: src/util/gnunet-ecc.c:463
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:442
+#: src/util/gnunet-ecc.c:468
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:447
+#: src/util/gnunet-ecc.c:473
 msgid "print the private key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:452
+#: src/util/gnunet-ecc.c:478
 msgid "print the public key in HEX format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:458
+#: src/util/gnunet-ecc.c:484
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:472
+#: src/util/gnunet-ecc.c:498
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
@@ -8686,32 +8764,32 @@ msgstr ""
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:179
+#: src/util/gnunet-resolver.c:182
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:219
+#: src/util/gnunet-scrypt.c:222
 #, fuzzy, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr "Tolkning av HTTP-svar för URL \"%s\" misslyckades.\n"
 
-#: src/util/gnunet-scrypt.c:285
+#: src/util/gnunet-scrypt.c:288
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:291
+#: src/util/gnunet-scrypt.c:294
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:297
+#: src/util/gnunet-scrypt.c:300
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:303
+#: src/util/gnunet-scrypt.c:306
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:316
+#: src/util/gnunet-scrypt.c:319
 #, fuzzy
 msgid "Manipulate GNUnet proof of work files"
 msgstr "skriv ut ett värde från konfigurationsfilen till standard ut"
@@ -8755,19 +8833,19 @@ msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:408
+#: src/util/os_installation.c:409
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:791
+#: src/util/os_installation.c:792
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Kunde inte hitta motpart \"%s\" i routingtabell!\n"
 
-#: src/util/os_installation.c:824
+#: src/util/os_installation.c:825
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
@@ -8847,14 +8925,14 @@ msgstr ""
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "Kunde inte slå upp \"%s\": %s\n"
 
-#: src/util/service.c:654
+#: src/util/service.c:653
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
-#: src/util/service.c:1569
+#: src/util/service.c:1568
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
@@ -8869,118 +8947,118 @@ msgstr ""
 msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
 
-#: src/util/strings.c:177
+#: src/util/strings.c:178
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:498
+#: src/util/strings.c:502
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:622
+#: src/util/strings.c:636
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 
-#: src/util/strings.c:691
+#: src/util/strings.c:705
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:695
+#: src/util/strings.c:709
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:697
+#: src/util/strings.c:711
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:701
+#: src/util/strings.c:715
 msgid "ms"
 msgstr "ms"
 
-#: src/util/strings.c:705
+#: src/util/strings.c:719
 msgid "s"
 msgstr "s"
 
-#: src/util/strings.c:709
+#: src/util/strings.c:723
 msgid "m"
 msgstr "m"
 
-#: src/util/strings.c:713
+#: src/util/strings.c:727
 msgid "h"
 msgstr "h"
 
-#: src/util/strings.c:719
+#: src/util/strings.c:733
 #, fuzzy
 msgid "day"
 msgstr " dagar"
 
-#: src/util/strings.c:721
+#: src/util/strings.c:735
 #, fuzzy
 msgid "days"
 msgstr " dagar"
 
-#: src/util/strings.c:749
+#: src/util/strings.c:763
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1219
+#: src/util/strings.c:1239
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1227
+#: src/util/strings.c:1247
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1234
+#: src/util/strings.c:1254
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1242
+#: src/util/strings.c:1262
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1251
+#: src/util/strings.c:1271
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Ogiltigt svar på \"%s\".\n"
 
-#: src/util/strings.c:1479 src/util/strings.c:1490
+#: src/util/strings.c:1498 src/util/strings.c:1509
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1499
+#: src/util/strings.c:1518
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Misslyckades att starta samling.\n"
 
-#: src/util/strings.c:1582 src/util/strings.c:1611 src/util/strings.c:1658
-#: src/util/strings.c:1678
+#: src/util/strings.c:1601 src/util/strings.c:1630 src/util/strings.c:1677
+#: src/util/strings.c:1697
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/util/strings.c:1636
+#: src/util/strings.c:1655
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ogiltig nätverksnotation (\"/%d\" är inte giltig i IPv4 CIDR)."
 
-#: src/util/strings.c:1687
+#: src/util/strings.c:1706
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "Ogiltigt format för IP: \"%s\"\n"
 
-#: src/util/strings.c:1740
+#: src/util/strings.c:1759
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ogiltig nätverksnotation (slutar inte med \";\": \"%s\")\n"
 
-#: src/util/strings.c:1790
+#: src/util/strings.c:1809
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Fel format \"%s\" för nätmask: %s\n"
 
-#: src/util/strings.c:1821
+#: src/util/strings.c:1840
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Fel format \"%s\" för nätverk: %s\n"
@@ -9180,6 +9258,14 @@ msgstr ""
 msgid "Failed to connect to the namestore!\n"
 msgstr "Misslyckades att ansluta till gnunetd.\n"
 
+#, fuzzy, c-format
+#~ msgid "Could not acquire lock on file `%s': %s...\n"
+#~ msgstr "Kunde inte slå upp \"%s\": %s\n"
+
+#, fuzzy
+#~ msgid "Creating a new private key.  This may take a while.\n"
+#~ msgstr "Skapar ny värdnyckel (det här kan ta en stund).\n"
+
 #, fuzzy
 #~ msgid "No default ego configured in identity service\n"
 #~ msgstr "\"%s\": okänd tjänst: %s\n"
@@ -10474,10 +10560,6 @@ msgstr "Misslyckades att ansluta till gnunetd.\n"
 #~ msgstr "Okänt fel"
 
 #, fuzzy
-#~ msgid "Failed to serialize meta data"
-#~ msgstr "Misslyckades att leverera \"%s\" meddelande.\n"
-
-#, fuzzy
 #~ msgid "Failed to parse URI `%s' from KBlock!\n"
 #~ msgstr "Fil \"%s\" har URI: %s\n"
 
diff --git a/po/vi.po b/po/vi.po
index 49888c476..c8d75014d 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet 0.8.0a\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2020-02-13 20:41+0100\n"
+"POT-Creation-Date: 2020-07-07 12:22+0200\n"
 "PO-Revision-Date: 2008-09-10 22:05+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -19,126 +19,126 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: LocFactoryEditor 1.7b3\n"
 
-#: src/abd/gnunet-abd.c:397 src/namestore/gnunet-namestore.c:1271
+#: src/abd/gnunet-abd.c:397 src/namestore/gnunet-namestore.c:1302
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:413 src/abd/gnunet-abd.c:886
+#: src/abd/gnunet-abd.c:413 src/abd/gnunet-abd.c:896
 #, fuzzy, c-format
 msgid "Issuer public key `%s' is not well-formed\n"
 msgstr "�ối số không hợp lệ cho « %s ».\n"
 
-#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1747
+#: src/abd/gnunet-abd.c:560 src/abd/gnunet-service-abd.c:1747
 #: src/namestore/gnunet-namestore.c:1001
-#: src/namestore/gnunet-namestore-fcfsd.c:1153
+#: src/namestore/gnunet-namestore-fcfsd.c:1154
 #, fuzzy, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "Không kết nối được đến trình n�n gnunetd."
 
-#: src/abd/gnunet-abd.c:825 src/abd/gnunet-abd.c:876
+#: src/abd/gnunet-abd.c:835 src/abd/gnunet-abd.c:886
 #, fuzzy, c-format
 msgid "Issuer public key not well-formed\n"
 msgstr "�ối số không hợp lệ cho « %s ».\n"
 
-#: src/abd/gnunet-abd.c:834 src/abd/gnunet-abd.c:895
+#: src/abd/gnunet-abd.c:844 src/abd/gnunet-abd.c:905
 #, fuzzy, c-format
 msgid "Failed to connect to ABD\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/abd/gnunet-abd.c:840
+#: src/abd/gnunet-abd.c:850
 #, c-format
 msgid "You must provide issuer the attribute\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:847
+#: src/abd/gnunet-abd.c:857
 #, c-format
 msgid "ego required\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:857
+#: src/abd/gnunet-abd.c:867
 #, c-format
 msgid "Subject public key needed\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:866
+#: src/abd/gnunet-abd.c:876
 #, fuzzy, c-format
 msgid "Subject public key `%s' is not well-formed\n"
 msgstr "�ối số không hợp lệ cho « %s ».\n"
 
-#: src/abd/gnunet-abd.c:901
+#: src/abd/gnunet-abd.c:911
 #, c-format
 msgid "You must provide issuer and subject attributes\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:957
+#: src/abd/gnunet-abd.c:970
 #, c-format
 msgid "Please specify name to lookup, subject key and issuer key!\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:978
+#: src/abd/gnunet-abd.c:991
 msgid "verify credential against attribute"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:985
+#: src/abd/gnunet-abd.c:998
 #, fuzzy
 msgid ""
 "The public key of the subject to lookup thecredential for, or for issuer "
 "side storage: subject and its attributes"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/abd/gnunet-abd.c:992
+#: src/abd/gnunet-abd.c:1005
 msgid "The private, signed delegate presented by the subject"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:999
+#: src/abd/gnunet-abd.c:1012
 #, fuzzy
 msgid "The public key of the authority to verify the credential against"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/abd/gnunet-abd.c:1004
+#: src/abd/gnunet-abd.c:1017
 #, fuzzy
 msgid "The ego/zone name to use"
 msgstr "kích cỡ tin nhắn"
 
-#: src/abd/gnunet-abd.c:1010
+#: src/abd/gnunet-abd.c:1023
 msgid "The issuer attribute to verify against or to issue"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1016
+#: src/abd/gnunet-abd.c:1029
 msgid ""
 "The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1021
+#: src/abd/gnunet-abd.c:1034
 msgid "collect credentials"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1026
+#: src/abd/gnunet-abd.c:1039
 msgid "Create and issue a credential issuer side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1031
+#: src/abd/gnunet-abd.c:1044
 msgid "Issue a credential subject side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1036
+#: src/abd/gnunet-abd.c:1049
 msgid "Create, sign and return a credential subject side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1043
+#: src/abd/gnunet-abd.c:1056
 msgid "Import signed credentials that should be issued to a zone/ego"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1047
+#: src/abd/gnunet-abd.c:1060
 msgid "Create private record entry."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1053 src/abd/gnunet-abd.c:1059
+#: src/abd/gnunet-abd.c:1066 src/abd/gnunet-abd.c:1072
 msgid "Indicates that the collect/verify process is done via forward search."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1072
+#: src/abd/gnunet-abd.c:1085
 #, fuzzy
 msgid "GNUnet abd resolver tool"
 msgstr "Bản ghi lỗi GNUnet"
@@ -392,28 +392,28 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:1129
 #: src/transport/plugin_transport_tcp.c:3706
 #: src/transport/tcp_service_legacy.c:594
-#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1091
-#: src/util/service.c:1097
+#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1090
+#: src/util/service.c:1096
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:452 src/transport/plugin_transport_tcp.c:1163
 #: src/transport/tcp_service_legacy.c:634 src/util/client.c:527
-#: src/util/service.c:1130
+#: src/util/service.c:1129
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:456 src/transport/plugin_transport_tcp.c:1167
 #: src/transport/tcp_service_legacy.c:638 src/util/client.c:532
-#: src/util/service.c:1134
+#: src/util/service.c:1133
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s: tùy ch�n « %s » là mơ hồ\n"
 
 #: src/arm/gnunet-service-arm.c:484 src/transport/plugin_transport_tcp.c:1195
-#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1154
+#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1153
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -421,7 +421,7 @@ msgid ""
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:505 src/transport/plugin_transport_tcp.c:1213
-#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1172
+#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1171
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
@@ -429,7 +429,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:536
 #: src/transport/plugin_transport_http_server.c:2718
 #: src/transport/plugin_transport_tcp.c:1244
-#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1203
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1202
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
@@ -437,7 +437,7 @@ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 #: src/arm/gnunet-service-arm.c:555
 #: src/transport/plugin_transport_http_server.c:2736
 #: src/transport/plugin_transport_tcp.c:1263
-#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1222
+#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1221
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
@@ -576,12 +576,12 @@ msgstr ""
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "Không thể sơ khởi SQLite: %s.\n"
 
-#: src/ats/plugin_ats_proportional.c:1140
+#: src/ats/plugin_ats_proportional.c:1142
 #, fuzzy, c-format
 msgid "Invalid %s configuration %f \n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/ats/plugin_ats_proportional.c:1163
+#: src/ats/plugin_ats_proportional.c:1165
 #, fuzzy, c-format
 msgid "Invalid %s configuration %f\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
@@ -773,7 +773,7 @@ msgstr ""
 
 #: src/auction/gnunet-auction-info.c:77 src/auction/gnunet-auction-join.c:77
 #: src/conversation/gnunet-conversation-test.c:256
-#: src/revocation/gnunet-revocation.c:524 src/template/gnunet-template.c:75
+#: src/revocation/gnunet-revocation.c:552 src/template/gnunet-template.c:75
 msgid "help text"
 msgstr ""
 
@@ -1394,12 +1394,12 @@ msgstr "# các thông báo được chắp li�n"
 msgid "# messages of type %u discarded (client busy)"
 msgstr "# các byte nhiễu được nhận"
 
-#: src/core/gnunet-service-core.c:926
+#: src/core/gnunet-service-core.c:927
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "Lưu cấu hình ngay bây gi� không?"
 
-#: src/core/gnunet-service-core.c:945
+#: src/core/gnunet-service-core.c:955
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "Không gian tên « %s » có đánh giá %d.\n"
@@ -1430,132 +1430,132 @@ msgstr ""
 msgid "# PING messages transmitted"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:978
+#: src/core/gnunet-service-core_kx.c:979
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:992
+#: src/core/gnunet-service-core_kx.c:993
 #, fuzzy
 msgid "# duplicate ephemeral keys ignored"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/core/gnunet-service-core_kx.c:1027
+#: src/core/gnunet-service-core_kx.c:1028
 #, fuzzy
 msgid "# EPHEMERAL_KEYs rejected (bad signature)"
 msgstr "# các thông báo được chắp li�n"
 
-#: src/core/gnunet-service-core_kx.c:1045
+#: src/core/gnunet-service-core_kx.c:1046
 #, c-format
 msgid ""
 "EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match "
 "our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1052
+#: src/core/gnunet-service-core_kx.c:1053
 #, fuzzy
 msgid "# EPHEMERAL_KEY messages rejected due to time"
 msgstr "# các thông báo được chắp li�n"
 
-#: src/core/gnunet-service-core_kx.c:1070
+#: src/core/gnunet-service-core_kx.c:1071
 #, fuzzy
 msgid "# valid ephemeral keys received"
 msgstr "# các thông báo phát hiện dht được nhận"
 
-#: src/core/gnunet-service-core_kx.c:1179
+#: src/core/gnunet-service-core_kx.c:1180
 #: src/transport/gnunet-service-transport_validation.c:1133
 #, fuzzy
 msgid "# PING messages received"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1189
+#: src/core/gnunet-service-core_kx.c:1190
 #, fuzzy
 msgid "# PING messages dropped (out of order)"
 msgstr "# các yêu cầu lỗ hổng bị b� do tr�ng tải"
 
-#: src/core/gnunet-service-core_kx.c:1238
+#: src/core/gnunet-service-core_kx.c:1239
 #, fuzzy
 msgid "# PONG messages created"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1263
+#: src/core/gnunet-service-core_kx.c:1264
 #, fuzzy
 msgid "# sessions terminated by timeout"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1276
+#: src/core/gnunet-service-core_kx.c:1277
 #, fuzzy
 msgid "# keepalive messages sent"
 msgstr "# các thông báo PING nhập thô được gửi"
 
-#: src/core/gnunet-service-core_kx.c:1333
-#: src/transport/gnunet-service-transport_validation.c:1475
+#: src/core/gnunet-service-core_kx.c:1334
+#: src/transport/gnunet-service-transport_validation.c:1476
 #, fuzzy
 msgid "# PONG messages received"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/core/gnunet-service-core_kx.c:1341
+#: src/core/gnunet-service-core_kx.c:1342
 #, fuzzy
 msgid "# PONG messages dropped (connection down)"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/core/gnunet-service-core_kx.c:1349
+#: src/core/gnunet-service-core_kx.c:1350
 #, fuzzy
 msgid "# PONG messages dropped (out of order)"
 msgstr "# các yêu cầu lỗ hổng bị b� do tr�ng tải"
 
-#: src/core/gnunet-service-core_kx.c:1388
+#: src/core/gnunet-service-core_kx.c:1389
 #, fuzzy
 msgid "# PONG messages decrypted"
 msgstr "# các thông báo PING được tạo"
 
-#: src/core/gnunet-service-core_kx.c:1428
+#: src/core/gnunet-service-core_kx.c:1429
 #, fuzzy
 msgid "# session keys confirmed via PONG"
 msgstr "# Các quảng cáo đồng đẳng được xác nhận qua PONG"
 
-#: src/core/gnunet-service-core_kx.c:1440
+#: src/core/gnunet-service-core_kx.c:1441
 #, fuzzy
 msgid "# timeouts prevented via PONG"
 msgstr "# các byte đã nhận qua TCP"
 
-#: src/core/gnunet-service-core_kx.c:1449
+#: src/core/gnunet-service-core_kx.c:1450
 #, fuzzy
 msgid "# rekey operations confirmed via PONG"
 msgstr "# Các quảng cáo đồng đẳng được xác nhận qua PONG"
 
-#: src/core/gnunet-service-core_kx.c:1625
+#: src/core/gnunet-service-core_kx.c:1626
 #, fuzzy
 msgid "# DATA message dropped (out of order)"
 msgstr "# các byte loại b� bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1636
+#: src/core/gnunet-service-core_kx.c:1637
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1640
+#: src/core/gnunet-service-core_kx.c:1641
 #, fuzzy
 msgid "# sessions terminated by key expiration"
 msgstr "# các byte loại đi bởi TCP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1718
-#: src/core/gnunet-service-core_kx.c:1745
+#: src/core/gnunet-service-core_kx.c:1719
+#: src/core/gnunet-service-core_kx.c:1746
 #, fuzzy
 msgid "# bytes dropped (duplicates)"
 msgstr "# các byte loại b� bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1731
+#: src/core/gnunet-service-core_kx.c:1732
 #, fuzzy
 msgid "# bytes dropped (out of sequence)"
 msgstr "# các byte loại b� bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1776
+#: src/core/gnunet-service-core_kx.c:1777
 #, fuzzy
 msgid "# bytes dropped (ancient message)"
 msgstr "# các byte loại b� bởi UDP (đi ra)"
 
-#: src/core/gnunet-service-core_kx.c:1785
+#: src/core/gnunet-service-core_kx.c:1786
 #, fuzzy
 msgid "# bytes of payload decrypted"
 msgstr "# các byte đã giải mã"
@@ -2798,56 +2798,56 @@ msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1141
+#: src/fs/fs_api.c:1173
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:1667
+#: src/fs/fs_api.c:1724
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1682
+#: src/fs/fs_api.c:1739
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2366
+#: src/fs/fs_api.c:2468
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2377
+#: src/fs/fs_api.c:2479
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2513 src/fs/fs_api.c:2759
+#: src/fs/fs_api.c:2627 src/fs/fs_api.c:2873
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2531
+#: src/fs/fs_api.c:2645
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_api.c:2547 src/fs/fs_api.c:2567 src/fs/fs_api.c:3058
+#: src/fs/fs_api.c:2661 src/fs/fs_api.c:2681 src/fs/fs_api.c:3180
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2749
+#: src/fs/fs_api.c:2863
 #, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3002
+#: src/fs/fs_api.c:3124
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3097
+#: src/fs/fs_api.c:3219
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2950,17 +2950,17 @@ msgstr ""
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/fs_namespace.c:227
+#: src/fs/fs_namespace.c:233
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/fs/fs_namespace.c:321
+#: src/fs/fs_namespace.c:330
 #, fuzzy, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr "Lỗi chạy %s: %s %d\n"
 
-#: src/fs/fs_namespace.c:463
+#: src/fs/fs_namespace.c:472
 #, fuzzy
 msgid "Failed to connect to datastore."
 msgstr "Không kết nối được đến trình n�n gnunetd."
@@ -3183,67 +3183,67 @@ msgstr "�ối số không hợp lệ cho « %s ».\n"
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:1072 src/fs/fs_uri.c:1099
+#: src/fs/fs_uri.c:1071 src/fs/fs_uri.c:1098
 msgid "No keywords specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/fs/fs_uri.c:1105
+#: src/fs/fs_uri.c:1104
 msgid "Number of double-quotes not balanced!\n"
 msgstr "Có dấu nháy kép thừa hay thiếu.\n"
 
-#: src/fs/gnunet-auto-share.c:230
+#: src/fs/gnunet-auto-share.c:234
 #, fuzzy, c-format
 msgid "Failed to load state: %s\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/fs/gnunet-auto-share.c:278 src/fs/gnunet-auto-share.c:287
-#: src/fs/gnunet-auto-share.c:295
+#: src/fs/gnunet-auto-share.c:286 src/fs/gnunet-auto-share.c:295
+#: src/fs/gnunet-auto-share.c:303
 #, fuzzy, c-format
 msgid "Failed to save state to file %s\n"
 msgstr "Lỗi đ�c danh sách bạn bè từ « %s »\n"
 
-#: src/fs/gnunet-auto-share.c:392
+#: src/fs/gnunet-auto-share.c:400
 #, c-format
 msgid "Publication of `%s' done\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:471
+#: src/fs/gnunet-auto-share.c:479
 #, fuzzy, c-format
 msgid "Publishing `%s'\n"
 msgstr "Gặp lỗi khi tải lên tập tin: %s\n"
 
-#: src/fs/gnunet-auto-share.c:483
+#: src/fs/gnunet-auto-share.c:491
 #, fuzzy, c-format
 msgid "Failed to run `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/fs/gnunet-auto-share.c:653
+#: src/fs/gnunet-auto-share.c:661
 #, fuzzy, c-format
 msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr "Phải ghi rõ chỉ một tên tập tin để chèn.\n"
 
-#: src/fs/gnunet-auto-share.c:703 src/fs/gnunet-publish.c:888
+#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:888
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr "đặt CẤP mong muốn của tình trạng nặc danh của ngư�i gửi"
 
-#: src/fs/gnunet-auto-share.c:710
+#: src/fs/gnunet-auto-share.c:718
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr "tắt thêm gi� tạo vào siêu dữ liệu của tập tin đã tải lên"
 
-#: src/fs/gnunet-auto-share.c:716 src/fs/gnunet-publish.c:893
+#: src/fs/gnunet-auto-share.c:724 src/fs/gnunet-publish.c:893
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:723 src/fs/gnunet-publish.c:938
+#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:938
 msgid "specify the priority of the content"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/fs/gnunet-auto-share.c:730 src/fs/gnunet-publish.c:951
+#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:951
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:753
+#: src/fs/gnunet-auto-share.c:761
 #, fuzzy
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr "Tự động chia sẻ một thư mục."
@@ -3688,7 +3688,7 @@ msgstr ""
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "Lưu cấu hình ngay bây gi� không?"
 
-#: src/fs/gnunet-service-fs.c:1307 src/hostlist/gnunet-daemon-hostlist.c:355
+#: src/fs/gnunet-service-fs.c:1316 src/hostlist/gnunet-daemon-hostlist.c:343
 #: src/topology/gnunet-daemon-topology.c:1098
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
@@ -3815,40 +3815,40 @@ msgid "# migration stop messages sent"
 msgstr "# các thông báo phát hiện dht được nhận"
 
 #: src/fs/gnunet-service-fs_indexing.c:130
-#: src/fs/gnunet-service-fs_indexing.c:185
+#: src/fs/gnunet-service-fs_indexing.c:188
 #, fuzzy, c-format
 msgid "Could not open `%s'.\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:144
+#: src/fs/gnunet-service-fs_indexing.c:147
 #, fuzzy, c-format
 msgid "Error writing `%s'.\n"
 msgstr "Gặp lỗi khi tạo ngư�i dùng"
 
-#: src/fs/gnunet-service-fs_indexing.c:241
+#: src/fs/gnunet-service-fs_indexing.c:244
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:314
+#: src/fs/gnunet-service-fs_indexing.c:317
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:328
+#: src/fs/gnunet-service-fs_indexing.c:331
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:332
+#: src/fs/gnunet-service-fs_indexing.c:335
 msgid "not indexed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:346
+#: src/fs/gnunet-service-fs_indexing.c:349
 #, fuzzy, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr "�ánh chỉ mục dữ liệu của tập tin « %s » bị lỗi tại vị tri %llu.\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:452
+#: src/fs/gnunet-service-fs_indexing.c:455
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -4039,68 +4039,68 @@ msgstr ""
 msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:132
+#: src/gns/gnunet-bcd.c:133
 #, fuzzy, c-format
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/gns/gnunet-bcd.c:346
+#: src/gns/gnunet-bcd.c:347
 #, c-format
 msgid "Invalid port number %u.  Exiting.\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:351
+#: src/gns/gnunet-bcd.c:352
 #, fuzzy, c-format
 msgid "Businesscard HTTP server starts on %u\n"
 msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất"
 
-#: src/gns/gnunet-bcd.c:371
+#: src/gns/gnunet-bcd.c:372
 #, fuzzy, c-format
 msgid "Could not start businesscard HTTP server on port %u\n"
 msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất"
 
-#: src/gns/gnunet-bcd.c:508
+#: src/gns/gnunet-bcd.c:509
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:521
+#: src/gns/gnunet-bcd.c:522
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:213
+#: src/gns/gnunet-dns2gns.c:239
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-dns2gns.c:418
+#: src/gns/gnunet-dns2gns.c:442
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:434
+#: src/gns/gnunet-dns2gns.c:458
 #, fuzzy, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/gns/gnunet-dns2gns.c:442
+#: src/gns/gnunet-dns2gns.c:466
 #, fuzzy, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/gns/gnunet-dns2gns.c:603
+#: src/gns/gnunet-dns2gns.c:627
 #, fuzzy
 msgid "No DNS server specified!\n"
 msgstr "Chưa ghi rõ từ khoá.\n"
 
-#: src/gns/gnunet-dns2gns.c:752
+#: src/gns/gnunet-dns2gns.c:776
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:758
+#: src/gns/gnunet-dns2gns.c:782
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:775
+#: src/gns/gnunet-dns2gns.c:799
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -4241,44 +4241,44 @@ msgstr "Không thể lưu tập tin cấu hình « %s »:"
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/gns/gnunet-gns-proxy.c:2922 src/rest/gnunet-rest-server.c:709
+#: src/gns/gnunet-gns-proxy.c:2922 src/rest/gnunet-rest-server.c:713
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3268
+#: src/gns/gnunet-gns-proxy.c:3271
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». �ang hủy b�.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3300
+#: src/gns/gnunet-gns-proxy.c:3303
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». �ang hủy b�.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3386
+#: src/gns/gnunet-gns-proxy.c:3389
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "Lệnh không được hỗ trợ « %s ». �ang hủy b�.\n"
 
-#: src/gns/gnunet-gns-proxy.c:3727
+#: src/gns/gnunet-gns-proxy.c:3730
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "Lỗi đ�c danh sách bạn bè từ « %s »\n"
 
-#: src/gns/gnunet-gns-proxy.c:3861
+#: src/gns/gnunet-gns-proxy.c:3864
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3866
+#: src/gns/gnunet-gns-proxy.c:3869
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3870
+#: src/gns/gnunet-gns-proxy.c:3873
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3896
+#: src/gns/gnunet-gns-proxy.c:3899
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -4324,51 +4324,51 @@ msgstr ""
 msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:932
+#: src/gns/gnunet-service-gns_resolver.c:938
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1123
+#: src/gns/gnunet-service-gns_resolver.c:1129
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1439
+#: src/gns/gnunet-service-gns_resolver.c:1447
 #, c-format
 msgid "VPN returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1896
+#: src/gns/gnunet-service-gns_resolver.c:1909
 #, c-format
 msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1909
+#: src/gns/gnunet-service-gns_resolver.c:1922
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1952
+#: src/gns/gnunet-service-gns_resolver.c:1965
 #, fuzzy, c-format
 msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr "Vẫn còn không tìm thấy đồng đẳng trong « %s ».\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2372
+#: src/gns/gnunet-service-gns_resolver.c:2385
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2395
+#: src/gns/gnunet-service-gns_resolver.c:2408
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2563
+#: src/gns/gnunet-service-gns_resolver.c:2576
 #, c-format
 msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2703
+#: src/gns/gnunet-service-gns_resolver.c:2716
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
@@ -4398,7 +4398,7 @@ msgstr "Lỗi đ�c danh sách bạn bè từ « %s »\n"
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "Lỗi đ�c danh sách bạn bè từ « %s »\n"
 
-#: src/gns/plugin_rest_gns.c:443
+#: src/gns/plugin_rest_gns.c:445
 #, fuzzy
 msgid "Gns REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
@@ -4548,34 +4548,34 @@ msgstr ""
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:316
+#: src/hostlist/gnunet-daemon-hostlist.c:306
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:377
+#: src/hostlist/gnunet-daemon-hostlist.c:364
 #, fuzzy
 msgid "advertise our hostlist to other peers"
 msgstr "Tắt quảng cáo máy này cho đồng đẳng khác"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:383
+#: src/hostlist/gnunet-daemon-hostlist.c:369
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:388
+#: src/hostlist/gnunet-daemon-hostlist.c:374
 #, fuzzy
 msgid "enable learning about hostlist servers from other peers"
 msgstr "Tắt quảng cáo máy này cho đồng đẳng khác"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:393
+#: src/hostlist/gnunet-daemon-hostlist.c:378
 #, fuzzy
 msgid "provide a hostlist server"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:409
+#: src/hostlist/gnunet-daemon-hostlist.c:393
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -4602,7 +4602,7 @@ msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr "# các HELLO tải xuống qua HTTP"
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:677
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1455
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1459
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -4653,7 +4653,7 @@ msgid "# hostlist downloads initiated"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1144
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1715
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1726
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
@@ -4683,68 +4683,68 @@ msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1448
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1452
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1451
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1455
 #, fuzzy
 msgid "# hostlist URIs read from file"
 msgstr "# các byte danh sách máy được trả v�"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1502
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1506
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1509
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1513
 #, fuzzy, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr "�ang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1534
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1553
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1545
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1564
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1547
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1558
 #, fuzzy
 msgid "# hostlist URIs written to file"
 msgstr "# các byte danh sách máy được trả v�"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1644
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1655
 #: src/transport/plugin_transport_http_client.c:2301
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1673
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1684
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1686
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1697
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1700
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1711
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:172
+#: src/hostlist/gnunet-daemon-hostlist_server.c:173
 #, fuzzy
 msgid "bytes in hostlist"
 msgstr "# các byte trong kho dữ liệu"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:198
+#: src/hostlist/gnunet-daemon-hostlist_server.c:199
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:235
-#: src/hostlist/gnunet-daemon-hostlist_server.c:526
+#: src/hostlist/gnunet-daemon-hostlist_server.c:236
+#: src/hostlist/gnunet-daemon-hostlist_server.c:527
 #: src/peerinfo-tool/gnunet-peerinfo.c:379
 #: src/peerinfo-tool/gnunet-peerinfo.c:515
 #: src/topology/gnunet-daemon-topology.c:799
@@ -4752,202 +4752,207 @@ msgstr ""
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr "Cổng để liên lạc với giao diện ngư�i dùng GNUnet"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:256
+#: src/hostlist/gnunet-daemon-hostlist_server.c:257
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:274
+#: src/hostlist/gnunet-daemon-hostlist_server.c:275
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:376
+#: src/hostlist/gnunet-daemon-hostlist_server.c:377
 #, fuzzy, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr "trình phục vụ danh sách máy HTTP hợp nhất"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:380
+#: src/hostlist/gnunet-daemon-hostlist_server.c:381
 #, fuzzy
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:393
+#: src/hostlist/gnunet-daemon-hostlist_server.c:394
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:398
+#: src/hostlist/gnunet-daemon-hostlist_server.c:399
 #, fuzzy
 msgid "hostlist requests refused (upload data)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:408
+#: src/hostlist/gnunet-daemon-hostlist_server.c:409
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:411
+#: src/hostlist/gnunet-daemon-hostlist_server.c:412
 #, fuzzy
 msgid "hostlist requests refused (not ready)"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:417
+#: src/hostlist/gnunet-daemon-hostlist_server.c:418
 #, fuzzy
 msgid "Received request for our hostlist\n"
 msgstr "Nhận yêu cầu định tuyến\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:419
+#: src/hostlist/gnunet-daemon-hostlist_server.c:420
 #, fuzzy
 msgid "hostlist requests processed"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:460
+#: src/hostlist/gnunet-daemon-hostlist_server.c:461
 #, fuzzy
 msgid "# hostlist advertisements send"
 msgstr "# Các quảng cáo ngoại được chuyển tiếp"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:673
-#: src/transport/gnunet-service-transport.c:2657
+#: src/hostlist/gnunet-daemon-hostlist_server.c:674
+#: src/transport/gnunet-service-transport.c:2659
 #, fuzzy
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr "Không thể truy cập đến thông tin v� không gian tên.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:684
+#: src/hostlist/gnunet-daemon-hostlist_server.c:685
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:696
+#: src/hostlist/gnunet-daemon-hostlist_server.c:697
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:713
+#: src/hostlist/gnunet-daemon-hostlist_server.c:714
 #, fuzzy, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr "�ang thử tải danh sách các máy xuống « %s »\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:728
+#: src/hostlist/gnunet-daemon-hostlist_server.c:729
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:742
+#: src/hostlist/gnunet-daemon-hostlist_server.c:743
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:764
+#: src/hostlist/gnunet-daemon-hostlist_server.c:765
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:785
+#: src/hostlist/gnunet-daemon-hostlist_server.c:786
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "« %s » không sẵn sàng.\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:828
+#: src/hostlist/gnunet-daemon-hostlist_server.c:829
 #, fuzzy, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr "Cổng cho trình phục vụ HTTP danh sách máy chủ thống nhất"
 
-#: src/identity/gnunet-identity.c:193
+#: src/identity/gnunet-identity.c:209
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
 msgstr "Không thể tạo mi�n tên.\n"
 
-#: src/identity/gnunet-identity.c:233
+#: src/identity/gnunet-identity.c:250
 #, fuzzy, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr "Không thể tạo mi�n tên.\n"
 
-#: src/identity/gnunet-identity.c:391
+#: src/identity/gnunet-identity.c:445
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:396
+#: src/identity/gnunet-identity.c:450
 msgid "delete ego NAME "
 msgstr ""
 
-#: src/identity/gnunet-identity.c:400
+#: src/identity/gnunet-identity.c:455
+msgid ""
+"set the private key for the identity to PRIVATE_KEY (use together with -C)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:459
 msgid "display all egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:404
+#: src/identity/gnunet-identity.c:463
 msgid "reduce output"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:411
+#: src/identity/gnunet-identity.c:470
 msgid ""
 "set default identity to NAME for a subsystem SUBSYSTEM (use together with -"
 "s) or restrict results to NAME (use together with -d)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:415
+#: src/identity/gnunet-identity.c:474
 msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:419
+#: src/identity/gnunet-identity.c:478
 #, fuzzy
 msgid "display private keys as well"
 msgstr "hiển thị giá trị tổng kiểm của tập tin"
 
-#: src/identity/gnunet-identity.c:426
+#: src/identity/gnunet-identity.c:485
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:438
+#: src/identity/gnunet-identity.c:500
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:484
+#: src/identity/gnunet-service-identity.c:503
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:507
+#: src/identity/gnunet-service-identity.c:528
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:597
-#: src/identity/gnunet-service-identity.c:871
-#: src/identity/gnunet-service-identity.c:991
+#: src/identity/gnunet-service-identity.c:621
+#: src/identity/gnunet-service-identity.c:898
+#: src/identity/gnunet-service-identity.c:1018
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "Lỗi đ�c danh sách bạn bè từ « %s »\n"
 
-#: src/identity/gnunet-service-identity.c:607
+#: src/identity/gnunet-service-identity.c:631
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:700
+#: src/identity/gnunet-service-identity.c:726
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:847
+#: src/identity/gnunet-service-identity.c:874
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:889
-#: src/identity/gnunet-service-identity.c:1009
+#: src/identity/gnunet-service-identity.c:916
+#: src/identity/gnunet-service-identity.c:1035
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:1043
+#: src/identity/gnunet-service-identity.c:1072
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "Lỗi đ�c danh sách bạn bè từ « %s »\n"
 
-#: src/identity/gnunet-service-identity.c:1099
+#: src/identity/gnunet-service-identity.c:1130
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/identity/gnunet-service-identity.c:1108
+#: src/identity/gnunet-service-identity.c:1139
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "Lỗi đ�c danh sách bạn bè từ « %s »\n"
 
-#: src/identity/plugin_rest_identity.c:1359
+#: src/identity/plugin_rest_identity.c:1406
 #, fuzzy
 msgid "Identity REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
@@ -4997,7 +5002,7 @@ msgstr "�ối số không hợp lệ cho « %s ».\n"
 msgid "You must specify a name\n"
 msgstr "Phải ghi rõ tên hiệu\n"
 
-#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:1608
+#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:1639
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -5006,7 +5011,7 @@ msgstr ""
 msgid "specifies the public key of the zone to look in"
 msgstr "xác định mức ưu tiên của nội dung"
 
-#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:1669
+#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:1700
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "Cấu hình GNUnet"
@@ -5115,9 +5120,10 @@ msgstr "Lỗi mở tập tin ghi sự kiện « %s »: %s\n"
 msgid "No options given\n"
 msgstr "chưa đưa ra tên"
 
-#: src/namestore/gnunet-namestore.c:1014 src/namestore/gnunet-namestore.c:1047
-#: src/namestore/gnunet-namestore.c:1057 src/namestore/gnunet-namestore.c:1075
-#: src/namestore/gnunet-namestore.c:1096 src/namestore/gnunet-namestore.c:1123
+#: src/namestore/gnunet-namestore.c:1014 src/namestore/gnunet-namestore.c:1065
+#: src/namestore/gnunet-namestore.c:1075 src/namestore/gnunet-namestore.c:1104
+#: src/namestore/gnunet-namestore.c:1125 src/namestore/gnunet-namestore.c:1152
+#: src/namestore/gnunet-namestore.c:1228
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên là con số\n"
@@ -5126,52 +5132,58 @@ msgstr "Giá trị cấu hình « %s » cho « %s » trong phần « %s » nên
 msgid "replace"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1049 src/namestore/gnunet-namestore.c:1059
-#: src/namestore/gnunet-namestore.c:1077 src/namestore/gnunet-namestore.c:1098
+#: src/namestore/gnunet-namestore.c:1045
+#, fuzzy, c-format
+msgid "Invalid nick `%s'\n"
+msgstr "Dữ liệu nhập không hợp lệ.\n"
+
+#: src/namestore/gnunet-namestore.c:1067 src/namestore/gnunet-namestore.c:1077
+#: src/namestore/gnunet-namestore.c:1106 src/namestore/gnunet-namestore.c:1127
+#: src/namestore/gnunet-namestore.c:1230
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1067
+#: src/namestore/gnunet-namestore.c:1085
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "Lệnh không được hỗ trợ « %s ». �ang hủy b�.\n"
 
-#: src/namestore/gnunet-namestore.c:1086
+#: src/namestore/gnunet-namestore.c:1095
+#, c-format
+msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1115
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1105
+#: src/namestore/gnunet-namestore.c:1134 src/namestore/gnunet-namestore.c:1237
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "�ịa chỉ IP định dạng sai: %s\n"
 
-#: src/namestore/gnunet-namestore.c:1125
+#: src/namestore/gnunet-namestore.c:1154
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1168
+#: src/namestore/gnunet-namestore.c:1197
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "�ối số không hợp lệ cho « %s ».\n"
 
-#: src/namestore/gnunet-namestore.c:1191
+#: src/namestore/gnunet-namestore.c:1220
 #: src/peerinfo-tool/gnunet-peerinfo.c:736
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "Dữ liệu nhập không hợp lệ.\n"
 
-#: src/namestore/gnunet-namestore.c:1217
-#, fuzzy, c-format
-msgid "Invalid nick `%s'\n"
-msgstr "Dữ liệu nhập không hợp lệ.\n"
-
-#: src/namestore/gnunet-namestore.c:1259
+#: src/namestore/gnunet-namestore.c:1290
 #, c-format
 msgid "Label `%s' contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1309
+#: src/namestore/gnunet-namestore.c:1340
 #, c-format
 msgid ""
 "No default identity configured for `namestore' subsystem\n"
@@ -5179,166 +5191,166 @@ msgid ""
 "Run gnunet-identity -d to get a list of choices for $NAME\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1374
+#: src/namestore/gnunet-namestore.c:1405
 #, c-format
 msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1403
+#: src/namestore/gnunet-namestore.c:1434
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/namestore/gnunet-namestore.c:1450
+#: src/namestore/gnunet-namestore.c:1481
 msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1462
+#: src/namestore/gnunet-namestore.c:1493
 #, c-format
 msgid "Invalid expiration time `%s' (must be without unit)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1474 src/namestore/gnunet-namestore.c:1490
-#: src/namestore/gnunet-namestore.c:1507
+#: src/namestore/gnunet-namestore.c:1505 src/namestore/gnunet-namestore.c:1521
+#: src/namestore/gnunet-namestore.c:1538
 #, fuzzy, c-format
 msgid "Missing entries in record line `%s'.\n"
 msgstr "Không thể nạp phần bổ sung truy�n tải « %s »\n"
 
-#: src/namestore/gnunet-namestore.c:1482
+#: src/namestore/gnunet-namestore.c:1513
 #, fuzzy, c-format
 msgid "Unknown record type `%s'\n"
 msgstr "Không rõ câu lệnh « %s ».\n"
 
-#: src/namestore/gnunet-namestore.c:1520
+#: src/namestore/gnunet-namestore.c:1551
 #, fuzzy, c-format
 msgid "Invalid record data for type %s: `%s'.\n"
 msgstr "�ịa chỉ IP định dạng sai: %s\n"
 
-#: src/namestore/gnunet-namestore.c:1577
+#: src/namestore/gnunet-namestore.c:1608
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1580
+#: src/namestore/gnunet-namestore.c:1611
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1584
+#: src/namestore/gnunet-namestore.c:1615
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1591
+#: src/namestore/gnunet-namestore.c:1622
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1597
+#: src/namestore/gnunet-namestore.c:1628
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "In ra thông tin v� các đồng đẳng GNUnet."
 
-#: src/namestore/gnunet-namestore.c:1602
+#: src/namestore/gnunet-namestore.c:1633
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "Không kết nối được đến trình n�n gnunetd."
 
-#: src/namestore/gnunet-namestore.c:1614
+#: src/namestore/gnunet-namestore.c:1645
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "In ra thông tin v� các đồng đẳng GNUnet."
 
-#: src/namestore/gnunet-namestore.c:1621
+#: src/namestore/gnunet-namestore.c:1652
 msgid ""
 "set record set to values given by (possibly multiple) RECORDLINES; can be "
 "specified multiple times"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1627
+#: src/namestore/gnunet-namestore.c:1658
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1632
+#: src/namestore/gnunet-namestore.c:1663
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1638
+#: src/namestore/gnunet-namestore.c:1669
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1642
+#: src/namestore/gnunet-namestore.c:1673
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1648
+#: src/namestore/gnunet-namestore.c:1679
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1654
+#: src/namestore/gnunet-namestore.c:1685
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:551
+#: src/namestore/gnunet-namestore-fcfsd.c:552
 #, fuzzy, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "Lệnh không được hỗ trợ « %s ». �ang hủy b�.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:578
+#: src/namestore/gnunet-namestore-fcfsd.c:579
 #, fuzzy, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:599
+#: src/namestore/gnunet-namestore-fcfsd.c:600
 msgid "Error when mapping zone to name\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:631
+#: src/namestore/gnunet-namestore-fcfsd.c:632
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:693
+#: src/namestore/gnunet-namestore-fcfsd.c:694
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:783
+#: src/namestore/gnunet-namestore-fcfsd.c:784
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "Không thể tạo mi�n tên.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:802
+#: src/namestore/gnunet-namestore-fcfsd.c:803
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "Lỗi cập nhật dữ liệu cho mô-đun « %s »\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:839
+#: src/namestore/gnunet-namestore-fcfsd.c:840
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:848
+#: src/namestore/gnunet-namestore-fcfsd.c:849
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1083
+#: src/namestore/gnunet-namestore-fcfsd.c:1084
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1114
+#: src/namestore/gnunet-namestore-fcfsd.c:1115
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1162
+#: src/namestore/gnunet-namestore-fcfsd.c:1163
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "Lỗi kết nối đến gnunetd.\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1189
+#: src/namestore/gnunet-namestore-fcfsd.c:1190
 msgid "name of the zone that is to be managed by FCFSD"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1209
+#: src/namestore/gnunet-namestore-fcfsd.c:1210
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
@@ -5374,7 +5386,7 @@ msgstr ""
 msgid "Flat file database running\n"
 msgstr "kho dữ liệu sqlite"
 
-#: src/namestore/plugin_rest_namestore.c:925
+#: src/namestore/plugin_rest_namestore.c:1093
 #, fuzzy
 msgid "Namestore REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
@@ -5692,8 +5704,8 @@ msgstr ""
 msgid "Measure quality and performance of the NSE service."
 msgstr "Không thể truy cập đến dịch vụ"
 
-#: src/nse/gnunet-service-nse.c:1437
-#: src/revocation/gnunet-service-revocation.c:846 src/util/gnunet-scrypt.c:247
+#: src/nse/gnunet-service-nse.c:1438
+#: src/revocation/gnunet-service-revocation.c:842 src/util/gnunet-scrypt.c:250
 #, fuzzy
 msgid "Value is too large.\n"
 msgstr "Giá trị không nằm trong phạm vi được phép."
@@ -5768,7 +5780,7 @@ msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:292
-#: src/peerinfo-tool/plugin_rest_peerinfo.c:499
+#: src/peerinfo-tool/plugin_rest_peerinfo.c:501
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "Lỗi đóng kết đến cổng %s %d.\n"
@@ -5849,7 +5861,7 @@ msgstr "�ang nạp các truy�n tải « %s »\n"
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "Không thể nạp phần bổ sung truy�n tải « %s »\n"
 
-#: src/peerinfo-tool/plugin_rest_peerinfo.c:795
+#: src/peerinfo-tool/plugin_rest_peerinfo.c:797
 #, fuzzy
 msgid "Peerinfo REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
@@ -5964,85 +5976,97 @@ msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:617
+#: src/reclaim/gnunet-reclaim.c:799
 #, fuzzy, c-format
 msgid "Ego is required\n"
 msgstr "Bị từ chối đặt tùy ch�n « %s » trong phần « %s » thành « %s ».\n"
 
-#: src/reclaim/gnunet-reclaim.c:624
+#: src/reclaim/gnunet-reclaim.c:806
 #, c-format
 msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:631
+#: src/reclaim/gnunet-reclaim.c:813
 #, fuzzy, c-format
 msgid "Requesting party key is required!\n"
 msgstr "đặt tên hiệu cần dùng (cần thiết)"
 
-#: src/reclaim/gnunet-reclaim.c:649
+#: src/reclaim/gnunet-reclaim.c:831
 msgid "Add an attribute NAME"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:654
+#: src/reclaim/gnunet-reclaim.c:836
 msgid "Delete the attribute with ID"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:659
+#: src/reclaim/gnunet-reclaim.c:841
 msgid "The attribute VALUE"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:664
+#: src/reclaim/gnunet-reclaim.c:846
 #, fuzzy
 msgid "The EGO to use"
 msgstr "kích cỡ tin nhắn"
 
-#: src/reclaim/gnunet-reclaim.c:670
+#: src/reclaim/gnunet-reclaim.c:852
 msgid "Specify the relying party for issue"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:674
+#: src/reclaim/gnunet-reclaim.c:856
 msgid "List attributes for EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:681
+#: src/reclaim/gnunet-reclaim.c:860
+msgid "List attestations for EGO"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:866
+msgid "Attestation to use for attribute"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:871
+msgid "Attestation name"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:877
 msgid "Issue a ticket for a set of attributes separated by comma"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:686
+#: src/reclaim/gnunet-reclaim.c:882
 msgid "Consume a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:691
+#: src/reclaim/gnunet-reclaim.c:887
 msgid "Revoke a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:696
+#: src/reclaim/gnunet-reclaim.c:892
 msgid "Type of attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:700
+#: src/reclaim/gnunet-reclaim.c:896
 msgid "List tickets of ego"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:706
+#: src/reclaim/gnunet-reclaim.c:902
 msgid "Expiration interval of the attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:714
+#: src/reclaim/gnunet-reclaim.c:910
 msgid "re:claimID command line tool"
 msgstr ""
 
-#: src/reclaim/plugin_rest_openid_connect.c:2340
+#: src/reclaim/plugin_rest_openid_connect.c:2481
 #, fuzzy
 msgid "OpenID Connect REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
 
-#: src/reclaim/plugin_rest_reclaim.c:1899
+#: src/reclaim/plugin_rest_reclaim.c:1476
 #, fuzzy
 msgid "Identity Provider REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
 
-#: src/reclaim/reclaim_api.c:436
+#: src/reclaim/reclaim_api.c:540
 #, fuzzy
 msgid "failed to store record\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
@@ -6136,12 +6160,12 @@ msgstr "« %s » không phải là một tập tin.\n"
 msgid "Search string `%s' is too long!\n"
 msgstr "« %s » không phải là một tập tin.\n"
 
-#: src/rest/gnunet-rest-server.c:1047
+#: src/rest/gnunet-rest-server.c:1051
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "Bản ghi lỗi GNUnet"
 
-#: src/rest/plugin_rest_config.c:401
+#: src/rest/plugin_rest_config.c:402
 #, fuzzy
 msgid "CONFIG REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
@@ -6151,140 +6175,158 @@ msgstr "Lỗi sơ khởi lõi.\n"
 msgid "COPYING REST API initialized\n"
 msgstr "Lỗi sơ khởi lõi.\n"
 
-#: src/revocation/gnunet-revocation.c:127
+#: src/revocation/gnunet-revocation.c:114
+#, fuzzy
+msgid "Shutting down...\n"
+msgstr "�ang bắt đầu tài v� « %s »\n"
+
+#: src/revocation/gnunet-revocation.c:146
 #, fuzzy, c-format
 msgid "Key `%s' is valid\n"
 msgstr "�ịnh dạng của biệt hiệu « %s » là không hợp lệ.\n"
 
-#: src/revocation/gnunet-revocation.c:131
+#: src/revocation/gnunet-revocation.c:150
 #, fuzzy, c-format
 msgid "Key `%s' has been revoked\n"
 msgstr "Dịch vụ đã bị xoá.\n"
 
-#: src/revocation/gnunet-revocation.c:135
+#: src/revocation/gnunet-revocation.c:154
 #, fuzzy
 msgid "Internal error\n"
 msgstr "Lá»—i VR."
 
-#: src/revocation/gnunet-revocation.c:161
+#: src/revocation/gnunet-revocation.c:180
 #, c-format
 msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:164
+#: src/revocation/gnunet-revocation.c:183
 #, fuzzy
 msgid "Revocation failed (!)\n"
 msgstr "Lỗi nội bộ : khẳng định không thành công tại %s:%d.\n"
 
-#: src/revocation/gnunet-revocation.c:170
+#: src/revocation/gnunet-revocation.c:189
 #, c-format
 msgid "Key for ego `%s' has been successfully revoked\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:173
+#: src/revocation/gnunet-revocation.c:192
 msgid "Revocation successful.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:179
+#: src/revocation/gnunet-revocation.c:198
 msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:312
+#: src/revocation/gnunet-revocation.c:251
+msgid "Cancelling calculation.\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:296
 #, c-format
 msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:338
+#: src/revocation/gnunet-revocation.c:335
 #, fuzzy, c-format
 msgid "Ego `%s' not found.\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/revocation/gnunet-revocation.c:351
+#: src/revocation/gnunet-revocation.c:349
 #, c-format
 msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:368
+#: src/revocation/gnunet-revocation.c:359
 msgid "Revocation certificate ready\n"
 msgstr ""
 
+#: src/revocation/gnunet-revocation.c:371
+msgid "Continuing calculation where left off...\n"
+msgstr ""
+
 #: src/revocation/gnunet-revocation.c:378
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:409
+#: src/revocation/gnunet-revocation.c:416
 #, fuzzy, c-format
 msgid "Public key `%s' malformed\n"
 msgstr "�ối số không hợp lệ cho « %s ».\n"
 
-#: src/revocation/gnunet-revocation.c:419
+#: src/revocation/gnunet-revocation.c:426
 msgid ""
 "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:438
+#: src/revocation/gnunet-revocation.c:456
 #, fuzzy
 msgid "No filename to store revocation certificate given.\n"
 msgstr "Lỗi đ�c danh sách bạn bè từ « %s »\n"
 
-#: src/revocation/gnunet-revocation.c:451
+#: src/revocation/gnunet-revocation.c:471
 #, fuzzy, c-format
 msgid "Failed to read revocation certificate from `%s'\n"
 msgstr "Lỗi đ�c danh sách bạn bè từ « %s »\n"
 
-#: src/revocation/gnunet-revocation.c:471
+#: src/revocation/gnunet-revocation.c:493
 #, fuzzy
 msgid "No action specified. Nothing to do.\n"
 msgstr "Chưa xác định giao diện nên dùng mặc định.\n"
 
-#: src/revocation/gnunet-revocation.c:490
+#: src/revocation/gnunet-revocation.c:512
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:498
+#: src/revocation/gnunet-revocation.c:520
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:505
+#: src/revocation/gnunet-revocation.c:527
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:512
+#: src/revocation/gnunet-revocation.c:534
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:458
+#: src/revocation/gnunet-revocation.c:540
+#, fuzzy
+msgid "number of epochs to calculate for"
+msgstr "số lần lặp lại"
+
+#: src/revocation/gnunet-service-revocation.c:454
 #, fuzzy
 msgid "# unsupported revocations received via set union"
 msgstr "# các yêu cầu danh sách máy được nhận"
 
-#: src/revocation/gnunet-service-revocation.c:468
+#: src/revocation/gnunet-service-revocation.c:464
 #, fuzzy
 msgid "# revocation messages received via set union"
 msgstr "# các thông báo PONG đã mật mã được nhận"
 
-#: src/revocation/gnunet-service-revocation.c:474
+#: src/revocation/gnunet-service-revocation.c:470
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:478
+#: src/revocation/gnunet-service-revocation.c:474
 #, fuzzy
 msgid "# revocation set unions failed"
 msgstr "# các khoá phiên chạy được chấp nhận"
 
-#: src/revocation/gnunet-service-revocation.c:490
+#: src/revocation/gnunet-service-revocation.c:486
 #, fuzzy
 msgid "# revocation set unions completed"
 msgstr "# các sự truy�n PONG bị lỗi"
 
-#: src/revocation/gnunet-service-revocation.c:530
+#: src/revocation/gnunet-service-revocation.c:526
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:871
+#: src/revocation/gnunet-service-revocation.c:881
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "« %s »: Không thể kết nối.\n"
@@ -6474,93 +6516,93 @@ msgstr "�ã tải %llu byte xuống « %s ».\n"
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr "�ã tải %llu byte xuống « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:409
-#: src/statistics/gnunet-statistics.c:448
+#: src/statistics/gnunet-statistics.c:413
+#: src/statistics/gnunet-statistics.c:455
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "Lỗi lấy thông kê v� truy�n tải.\n"
 
-#: src/statistics/gnunet-statistics.c:412
-#: src/statistics/gnunet-statistics.c:451
+#: src/statistics/gnunet-statistics.c:416
+#: src/statistics/gnunet-statistics.c:458
 #, fuzzy, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "Lỗi lấy thông kê v� truy�n tải.\n"
 
-#: src/statistics/gnunet-statistics.c:526
+#: src/statistics/gnunet-statistics.c:532
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:532
+#: src/statistics/gnunet-statistics.c:538
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:571
+#: src/statistics/gnunet-statistics.c:577
 #, fuzzy, c-format
 msgid "No subsystem or name given\n"
 msgstr "chưa đưa ra tên"
 
-#: src/statistics/gnunet-statistics.c:583
+#: src/statistics/gnunet-statistics.c:589
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "Lỗi sơ khởi dịch vụ « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:710
+#: src/statistics/gnunet-statistics.c:725
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "�ối số không hợp lệ cho « %s ».\n"
 
-#: src/statistics/gnunet-statistics.c:726
+#: src/statistics/gnunet-statistics.c:742
 #, fuzzy, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "Không thể kết nối tới %s:%u: %s\n"
 
-#: src/statistics/gnunet-statistics.c:735
+#: src/statistics/gnunet-statistics.c:751
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:764
+#: src/statistics/gnunet-statistics.c:783
 #, c-format
 msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:797
+#: src/statistics/gnunet-statistics.c:816
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:803
+#: src/statistics/gnunet-statistics.c:821
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:810
+#: src/statistics/gnunet-statistics.c:827
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:816
+#: src/statistics/gnunet-statistics.c:832
 msgid "use as csv separator"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:823
+#: src/statistics/gnunet-statistics.c:838
 msgid "path to the folder containing the testbed data"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:829
+#: src/statistics/gnunet-statistics.c:843
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:834
+#: src/statistics/gnunet-statistics.c:847
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:840
+#: src/statistics/gnunet-statistics.c:852
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:846
+#: src/statistics/gnunet-statistics.c:857
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:861
+#: src/statistics/gnunet-statistics.c:874
 msgid "Print statistics about GNUnet operations."
 msgstr "In ra thống kê v� các thao tác GNUnet."
 
@@ -6652,7 +6694,7 @@ msgid ""
 msgstr ""
 
 #: src/testbed/gnunet-daemon-testbed-underlay.c:234 src/testing/list-keys.c:47
-#: src/testing/testing.c:284 src/util/gnunet-ecc.c:292
+#: src/testing/testing.c:284 src/util/gnunet-ecc.c:318
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
@@ -7045,40 +7087,40 @@ msgstr "# các thông báo PONG đã mật mã được nhận"
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:2227
-#: src/transport/gnunet-communicator-udp.c:2712
-#: src/transport/gnunet-service-tng.c:10024
-#: src/transport/gnunet-service-transport.c:2627
+#: src/transport/gnunet-communicator-tcp.c:2458
+#: src/transport/gnunet-communicator-udp.c:2825
+#: src/transport/gnunet-service-tng.c:10027
+#: src/transport/gnunet-service-transport.c:2624
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "Lưu cấu hình ngay bây gi� không?"
 
-#: src/transport/gnunet-communicator-tcp.c:2285
+#: src/transport/gnunet-communicator-tcp.c:2754
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:2784
+#: src/transport/gnunet-communicator-udp.c:2897
 msgid "GNUnet UDP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:782
+#: src/transport/gnunet-communicator-unix.c:788
 #, fuzzy
 msgid ""
 "Maximum number of UNIX connections exceeded, dropping incoming message\n"
 msgstr "tăng sổ tối đa các kết nối TCP/IP"
 
-#: src/transport/gnunet-communicator-unix.c:1009
+#: src/transport/gnunet-communicator-unix.c:1015
 #, fuzzy
 msgid "UNIX communicator is lacking key configuration settings. Exiting.\n"
 msgstr "Lưu cấu hình ngay bây gi� không?"
 
-#: src/transport/gnunet-communicator-unix.c:1054
+#: src/transport/gnunet-communicator-unix.c:1060
 #: src/transport/plugin_transport_unix.c:1383
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "Không thể tạo mi�n tên.\n"
 
-#: src/transport/gnunet-communicator-unix.c:1132
+#: src/transport/gnunet-communicator-unix.c:1138
 msgid "GNUnet UNIX domain socket communicator"
 msgstr ""
 
@@ -7091,41 +7133,41 @@ msgstr ""
 msgid "# messages dropped due to slow client"
 msgstr "# các yêu cầu lỗ hổng bị b� do tr�ng tải"
 
-#: src/transport/gnunet-service-transport.c:791
+#: src/transport/gnunet-service-transport.c:794
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1474
+#: src/transport/gnunet-service-transport.c:1477
 #, fuzzy
 msgid "# bytes payload discarded due to not connected peer"
 msgstr "# Các quảng cáo đồng đẳng bị hủy do tr�ng tải"
 
-#: src/transport/gnunet-service-transport.c:1619
+#: src/transport/gnunet-service-transport.c:1622
 #, fuzzy
 msgid "# bytes total received"
 msgstr "# tổng số nội dung lỗ hổng được nhận"
 
-#: src/transport/gnunet-service-transport.c:1709
+#: src/transport/gnunet-service-transport.c:1712
 #, fuzzy
 msgid "# bytes payload received"
 msgstr "# các byte đã giải mã"
 
-#: src/transport/gnunet-service-transport.c:2013
-#: src/transport/gnunet-service-transport.c:2452
+#: src/transport/gnunet-service-transport.c:2016
+#: src/transport/gnunet-service-transport.c:2450
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2456
+#: src/transport/gnunet-service-transport.c:2454
 #, fuzzy, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "Không thể nạp phần bổ sung truy�n tải « %s »\n"
 
-#: src/transport/gnunet-service-transport.c:2551
+#: src/transport/gnunet-service-transport.c:2549
 #, fuzzy, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr "Không thể lấy địa chỉ của đồng đẳng « %s ».\n"
 
-#: src/transport/gnunet-service-transport.c:2560
+#: src/transport/gnunet-service-transport.c:2558
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
@@ -7383,7 +7425,7 @@ msgstr ""
 #: src/transport/gnunet-service-transport_validation.c:489
 #: src/transport/gnunet-service-transport_validation.c:679
 #: src/transport/gnunet-service-transport_validation.c:1000
-#: src/transport/gnunet-service-transport_validation.c:1626
+#: src/transport/gnunet-service-transport_validation.c:1627
 #, fuzzy
 msgid "# validations running"
 msgstr "kho dữ liệu sqlite"
@@ -7439,32 +7481,32 @@ msgid ""
 "having this address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1278
+#: src/transport/gnunet-service-transport_validation.c:1279
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "Không thể tạo mi�n tên.\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1330
+#: src/transport/gnunet-service-transport_validation.c:1331
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1339
+#: src/transport/gnunet-service-transport_validation.c:1340
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1514
+#: src/transport/gnunet-service-transport_validation.c:1515
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1532
+#: src/transport/gnunet-service-transport_validation.c:1533
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1589
+#: src/transport/gnunet-service-transport_validation.c:1590
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1644
+#: src/transport/gnunet-service-transport_validation.c:1645
 #, fuzzy
 msgid "# HELLOs given to peerinfo"
 msgstr "Nhận được thông báo « %s » sai từ đồng đẳng « %s ».\n"
@@ -8084,17 +8126,17 @@ msgstr "Không đủ quy�n cho « %s ».\n"
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1397
+#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1396
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "« %s » thất bại cho ổ đĩa « %s »: %u\n"
 
-#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1409
+#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1408
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
 
-#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1416
+#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1415
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "« %s » bị lỗi cho cổng %d. Trình gnunetd có chạy chưa?\n"
@@ -8106,7 +8148,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:345 src/util/service.c:834
+#: src/transport/tcp_service_legacy.c:345 src/util/service.c:833
 #, fuzzy, c-format
 msgid "Unknown address family %d\n"
 msgstr "\tKhông rõ mi�n tên « %s »\n"
@@ -8116,23 +8158,23 @@ msgstr "\tKhông rõ mi�n tên « %s »\n"
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:410 src/util/service.c:947
+#: src/transport/tcp_service_legacy.c:410 src/util/service.c:946
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:451 src/util/service.c:988
+#: src/transport/tcp_service_legacy.c:451 src/util/service.c:987
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:890
-#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1477
+#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1476
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1501
+#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1500
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -8147,29 +8189,29 @@ msgstr "Lỗi chạy %s: %s %d\n"
 msgid "Service `%s' runs at %s\n"
 msgstr "�ồng đẳng « %s » có mức tin cậy %8u\n"
 
-#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1747
+#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1746
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1752
+#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1751
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1757
+#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1756
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1253 src/util/disk.c:1177
-#: src/util/service.c:1638
+#: src/transport/tcp_service_legacy.c:1253 src/util/disk.c:1176
+#: src/util/service.c:1637
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "Không thể lấy thông tin v� ngư�i dùng « %s »: %s\n"
 
-#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1640
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1639
 msgid "No such user"
 msgstr "Không có ngư�i dùng như vậy"
 
-#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1654
+#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1653
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "Không thể thay đổi ngư�i dùng/nhóm thành « %s »: %s\n"
@@ -8179,13 +8221,13 @@ msgid "do daemonize (detach from terminal)"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:1397
-#: src/transport/transport-testing2.c:906 src/util/service.c:2070
-#: src/util/service.c:2082
+#: src/transport/transport-testing2.c:1061 src/util/service.c:2072
+#: src/util/service.c:2084
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
 
-#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2092
+#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2094
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "Không thể lưu tập tin cấu hình « %s »:"
@@ -8195,39 +8237,89 @@ msgstr "Không thể lưu tập tin cấu hình « %s »:"
 msgid "Could not access configuration file `%s'\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 
-#: src/transport/transport_api2_communication.c:704
+#: src/transport/transport_api2_communication.c:743
 msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/util/bio.c:177 src/util/bio.c:185
+#: src/util/bio.c:227 src/util/bio.c:235
 #, fuzzy, c-format
-msgid "Error reading `%s': %s"
+msgid "Error reading `%s' from file: %s"
 msgstr "Gặp lỗi khi tạo ngư�i dùng"
 
-#: src/util/bio.c:187
+#: src/util/bio.c:237
 msgid "End of file"
 msgstr ""
 
-#: src/util/bio.c:244
+#: src/util/bio.c:266
+#, fuzzy, c-format
+msgid "Error while reading `%s' from buffer: %s"
+msgstr "Gặp lỗi khi tải xuống: %s\n"
+
+#: src/util/bio.c:268
+msgid "Not enough data left"
+msgstr ""
+
+#: src/util/bio.c:308
+#, fuzzy, c-format
+msgid "Invalid handle type while reading `%s'"
+msgstr "�ối số không hợp lệ cho « %s ».\n"
+
+#: src/util/bio.c:335 src/util/bio.c:838
+msgid "string length"
+msgstr ""
+
+#: src/util/bio.c:341
+#, fuzzy, c-format
+msgid "%s (while reading `%s')"
+msgstr "Gặp lỗi khi tải xuống: %s\n"
+
+#: src/util/bio.c:346
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:255
+#: src/util/bio.c:359
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:303
-#, c-format
-msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
+#: src/util/bio.c:398 src/util/bio.c:863 src/util/bio.c:880
+msgid "metadata length"
 msgstr ""
 
-#: src/util/bio.c:319
+#: src/util/bio.c:410
 #, c-format
-msgid "Metadata `%s' failed to deserialize"
+msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
+msgstr ""
+
+#: src/util/bio.c:426
+#, fuzzy, c-format
+msgid "Failed to deserialize metadata `%s'"
+msgstr "Lỗi lấy thông kê v� truy�n tải.\n"
+
+#: src/util/bio.c:667
+msgid "Unable to flush buffer to file"
+msgstr ""
+
+#: src/util/bio.c:729 src/util/bio.c:750
+#, fuzzy, c-format
+msgid "Error while writing `%s' to file: %s"
+msgstr "Gặp lỗi khi tải xuống: %s\n"
+
+#: src/util/bio.c:731
+msgid "No associated file"
 msgstr ""
 
+#: src/util/bio.c:815
+#, fuzzy, c-format
+msgid "Invalid handle type while writing `%s'"
+msgstr "�ịa chỉ IP định dạng sai: %s\n"
+
+#: src/util/bio.c:875
+#, fuzzy, c-format
+msgid "Failed to serialize metadata `%s'"
+msgstr "Lỗi lấy thông kê v� truy�n tải.\n"
+
 #: src/util/client.c:747 src/util/client.c:937
 msgid "not a valid filename"
 msgstr ""
@@ -8237,27 +8329,27 @@ msgstr ""
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:259 src/util/common_logging.c:1112
+#: src/util/common_logging.c:259 src/util/common_logging.c:1114
 msgid "DEBUG"
 msgstr "Gá»  Lá»–I"
 
-#: src/util/common_logging.c:261 src/util/common_logging.c:1110
+#: src/util/common_logging.c:261 src/util/common_logging.c:1112
 msgid "INFO"
 msgstr "TIN"
 
-#: src/util/common_logging.c:263 src/util/common_logging.c:1108
+#: src/util/common_logging.c:263 src/util/common_logging.c:1110
 msgid "MESSAGE"
 msgstr ""
 
-#: src/util/common_logging.c:265 src/util/common_logging.c:1106
+#: src/util/common_logging.c:265 src/util/common_logging.c:1108
 msgid "WARNING"
 msgstr "CẢNH B�O"
 
-#: src/util/common_logging.c:267 src/util/common_logging.c:1104
+#: src/util/common_logging.c:267 src/util/common_logging.c:1106
 msgid "ERROR"
 msgstr "Lá»–I"
 
-#: src/util/common_logging.c:269 src/util/common_logging.c:1114
+#: src/util/common_logging.c:269 src/util/common_logging.c:1116
 msgid "NONE"
 msgstr ""
 
@@ -8266,30 +8358,30 @@ msgstr ""
 msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:902
+#: src/util/common_logging.c:904
 #, fuzzy, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "Thông điệp « %.*s » đã lặp lại %u lần trong %llu giây trước\n"
 
-#: src/util/common_logging.c:1115
+#: src/util/common_logging.c:1117
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1396
+#: src/util/common_logging.c:1398
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1441
+#: src/util/common_logging.c:1443
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1460
+#: src/util/common_logging.c:1462
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr ""
 "Cấu hình không th�a mãn các ràng buộc của tập tin đặc tả cấu hình « %s ».\n"
 
-#: src/util/common_logging.c:1483
+#: src/util/common_logging.c:1485
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8344,42 +8436,17 @@ msgid ""
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:705
+#: src/util/crypto_ecc.c:663
 #, fuzzy, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/util/crypto_ecc.c:822
+#: src/util/crypto_ecc.c:791
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
 
-#: src/util/crypto_ecc_setup.c:136 src/util/crypto_ecc_setup.c:178
-#: src/util/crypto_ecc_setup.c:318 src/util/crypto_ecc_setup.c:360
-#, fuzzy, c-format
-msgid "Could not acquire lock on file `%s': %s...\n"
-msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
-
-#: src/util/crypto_ecc_setup.c:142 src/util/crypto_ecc_setup.c:324
-#, fuzzy
-msgid "Creating a new private key.  This may take a while.\n"
-msgstr "�ang tạo khoá máy mới (có thể hơi lâu).\n"
-
-#: src/util/crypto_ecc_setup.c:184 src/util/crypto_ecc_setup.c:366
-msgid "This may be ok if someone is currently generating a private key.\n"
-msgstr ""
-
-#: src/util/crypto_ecc_setup.c:220 src/util/crypto_ecc_setup.c:402
-#, c-format
-msgid ""
-"When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
-msgstr ""
-
-#: src/util/crypto_ecc_setup.c:225 src/util/crypto_ecc_setup.c:407
-msgid "This may be ok if someone is currently generating a key.\n"
-msgstr ""
-
-#: src/util/crypto_ecc_setup.c:469
+#: src/util/crypto_ecc_setup.c:369
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
@@ -8389,17 +8456,17 @@ msgstr "Không thể truy cập đến tập tin gnunet-directory « %s »\n"
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt không có phiên bản mong đợi (yêu cầu phiên bản %s).\n"
 
-#: src/util/crypto_rsa.c:956
+#: src/util/crypto_rsa.c:959
 #, fuzzy, c-format
 msgid "RSA signing failed at %s:%d: %s\n"
 msgstr "%s bị lỗi tại %s:%d: « %s »\n"
 
-#: src/util/crypto_rsa.c:1314
+#: src/util/crypto_rsa.c:1318
 #, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "Lỗi thẩm tra chữ ký RSA tại %s:%d: %s\n"
 
-#: src/util/disk.c:941
+#: src/util/disk.c:940
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "Mong đợi « %s » là một thư mục.\n"
@@ -8534,41 +8601,52 @@ msgstr "cấu hình chức năng ghi sự kiện để dùng CẤP_GHI_LƯU"
 msgid "use configuration file FILENAME"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
 
-#: src/util/getopt_helpers.c:568 src/util/getopt_helpers.c:634
-#: src/util/getopt_helpers.c:835 src/util/getopt_helpers.c:900
+#: src/util/getopt_helpers.c:568 src/util/getopt_helpers.c:859
+#: src/util/getopt_helpers.c:924
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "Phải gửi một con số cho tùy ch�n « %s ».\n"
 
-#: src/util/getopt_helpers.c:659
+#: src/util/getopt_helpers.c:649
+#, fuzzy, c-format
+msgid ""
+"You must pass a relative time (optionally with sign) to the `%s' option.\n"
+msgstr "Phải gửi một con số cho tùy ch�n « %s ».\n"
+
+#: src/util/getopt_helpers.c:656
+#, c-format
+msgid "Value given for time travel `%s' option is too big.\n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:683
 msgid "[+/-]MICROSECONDS"
 msgstr ""
 
-#: src/util/getopt_helpers.c:661
+#: src/util/getopt_helpers.c:685
 msgid "modify system time by given offset (for debugging/testing only)"
 msgstr ""
 
-#: src/util/getopt_helpers.c:696
+#: src/util/getopt_helpers.c:720
 #, fuzzy, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "Phải gửi một con số cho tùy ch�n « %s ».\n"
 
-#: src/util/getopt_helpers.c:761
+#: src/util/getopt_helpers.c:785
 #, fuzzy, c-format
 msgid "You must pass absolute time to the `%s' option.\n"
 msgstr "Phải gửi một con số cho tùy ch�n « %s ».\n"
 
-#: src/util/getopt_helpers.c:828
+#: src/util/getopt_helpers.c:852
 #, c-format
 msgid "Your input for the '%s' option has to be a non negative number\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:907
+#: src/util/getopt_helpers.c:931
 #, fuzzy, c-format
 msgid "You must pass a number below %u to the `%s' option.\n"
 msgstr "Phải gửi một con số cho tùy ch�n « %s ».\n"
 
-#: src/util/getopt_helpers.c:994
+#: src/util/getopt_helpers.c:1018
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
@@ -8642,7 +8720,7 @@ msgstr ""
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:175
+#: src/util/gnunet-ecc.c:177
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8663,54 +8741,54 @@ msgid ""
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:277
+#: src/util/gnunet-ecc.c:303
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr "Khoá phiên chạy từ đồng đẳng « %s » không thể được thẩm tra.\n"
 
-#: src/util/gnunet-ecc.c:287
+#: src/util/gnunet-ecc.c:313
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr "�ịnh dạng của tập tin « %s » là không hợp lệ.\n"
 
-#: src/util/gnunet-ecc.c:307
+#: src/util/gnunet-ecc.c:333
 #, fuzzy, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr "Không thể đ�c danh sách bạn bè « %s »\n"
 
-#: src/util/gnunet-ecc.c:361
+#: src/util/gnunet-ecc.c:387
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:425
+#: src/util/gnunet-ecc.c:451
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:431
+#: src/util/gnunet-ecc.c:457
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:437
+#: src/util/gnunet-ecc.c:463
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:442
+#: src/util/gnunet-ecc.c:468
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:447
+#: src/util/gnunet-ecc.c:473
 msgid "print the private key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:452
+#: src/util/gnunet-ecc.c:478
 msgid "print the public key in HEX format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:458
+#: src/util/gnunet-ecc.c:484
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:472
+#: src/util/gnunet-ecc.c:498
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
@@ -8746,32 +8824,32 @@ msgstr ""
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:179
+#: src/util/gnunet-resolver.c:182
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:219
+#: src/util/gnunet-scrypt.c:222
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:285
+#: src/util/gnunet-scrypt.c:288
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:291
+#: src/util/gnunet-scrypt.c:294
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:297
+#: src/util/gnunet-scrypt.c:300
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:303
+#: src/util/gnunet-scrypt.c:306
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:316
+#: src/util/gnunet-scrypt.c:319
 #, fuzzy
 msgid "Manipulate GNUnet proof of work files"
 msgstr "cập nhật một giá trị trong tập tin cấu hình"
@@ -8815,19 +8893,19 @@ msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:408
+#: src/util/os_installation.c:409
 #, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr ""
 
-#: src/util/os_installation.c:791
+#: src/util/os_installation.c:792
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "Không thể đ�c danh sách bạn bè « %s »\n"
 
-#: src/util/os_installation.c:824
+#: src/util/os_installation.c:825
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
@@ -8905,14 +8983,14 @@ msgstr ""
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "Không thể giải quyết « %s » (%s): %s\n"
 
-#: src/util/service.c:654
+#: src/util/service.c:653
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
-#: src/util/service.c:1569
+#: src/util/service.c:1568
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
@@ -8927,119 +9005,119 @@ msgstr ""
 msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
 
-#: src/util/strings.c:177
+#: src/util/strings.c:178
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:498
+#: src/util/strings.c:502
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:622
+#: src/util/strings.c:636
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr ""
 "Lỗi mở rộng biến môi trư�ng « $HOME »: chưa đặt biến môi trư�ng « HOME »"
 
-#: src/util/strings.c:691
+#: src/util/strings.c:705
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:695
+#: src/util/strings.c:709
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:697
+#: src/util/strings.c:711
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:701
+#: src/util/strings.c:715
 msgid "ms"
 msgstr "mg"
 
-#: src/util/strings.c:705
+#: src/util/strings.c:719
 msgid "s"
 msgstr "g"
 
-#: src/util/strings.c:709
+#: src/util/strings.c:723
 msgid "m"
 msgstr "p"
 
-#: src/util/strings.c:713
+#: src/util/strings.c:727
 msgid "h"
 msgstr "g"
 
-#: src/util/strings.c:719
+#: src/util/strings.c:733
 #, fuzzy
 msgid "day"
 msgstr " ngày"
 
-#: src/util/strings.c:721
+#: src/util/strings.c:735
 #, fuzzy
 msgid "days"
 msgstr " ngày"
 
-#: src/util/strings.c:749
+#: src/util/strings.c:763
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1219
+#: src/util/strings.c:1239
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1227
+#: src/util/strings.c:1247
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1234
+#: src/util/strings.c:1254
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1242
+#: src/util/strings.c:1262
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1251
+#: src/util/strings.c:1271
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "Mức ưu tiên tiến trình không hợp lê « %s ».\n"
 
-#: src/util/strings.c:1479 src/util/strings.c:1490
+#: src/util/strings.c:1498 src/util/strings.c:1509
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1499
+#: src/util/strings.c:1518
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "Lỗi bắt đầu thu thập.\n"
 
-#: src/util/strings.c:1582 src/util/strings.c:1611 src/util/strings.c:1658
-#: src/util/strings.c:1678
+#: src/util/strings.c:1601 src/util/strings.c:1630 src/util/strings.c:1677
+#: src/util/strings.c:1697
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "�ịa chỉ IP định dạng sai: %s\n"
 
-#: src/util/strings.c:1636
+#: src/util/strings.c:1655
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "Ký hiệu mạng sai (« /%d » không hợp lệ trong CIDR IPv4)."
 
-#: src/util/strings.c:1687
+#: src/util/strings.c:1706
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "�ịa chỉ IP định dạng sai: %s\n"
 
-#: src/util/strings.c:1740
+#: src/util/strings.c:1759
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "Ký hiệu mạng sai (không kết thúc với « ; »: « %s »)\n"
 
-#: src/util/strings.c:1790
+#: src/util/strings.c:1809
 #, fuzzy, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "Mặt nạ mạng có định dạng sai « %s »: %s\n"
 
-#: src/util/strings.c:1821
+#: src/util/strings.c:1840
 #, fuzzy, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "Mạng có định dạng sai « %s »: %s\n"
@@ -9239,6 +9317,14 @@ msgstr ""
 msgid "Failed to connect to the namestore!\n"
 msgstr "Không kết nối được đến trình n�n gnunetd."
 
+#, fuzzy, c-format
+#~ msgid "Could not acquire lock on file `%s': %s...\n"
+#~ msgstr "Lỗi mở tập tin theo dõi « %s »: %s\n"
+
+#, fuzzy
+#~ msgid "Creating a new private key.  This may take a while.\n"
+#~ msgstr "�ang tạo khoá máy mới (có thể hơi lâu).\n"
+
 #, fuzzy
 #~ msgid "GNS REST API initialized\n"
 #~ msgstr "Lỗi sơ khởi lõi.\n"
@@ -10592,10 +10678,6 @@ msgstr "Không kết nối được đến trình n�n gnunetd."
 #~ msgstr "Lỗi không rõ.\n"
 
 #, fuzzy
-#~ msgid "Failed to serialize meta data"
-#~ msgstr "Lỗi lấy thông kê v� truy�n tải.\n"
-
-#, fuzzy
 #~ msgid "Failed to parse URI `%s' from KBlock!\n"
 #~ msgstr "Tập tin « %s » có URI: %s\n"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 66c21260f..c944b5cb7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnunet-0.8.1\n"
 "Report-Msgid-Bugs-To: gnunet-developers@mail.gnu.org\n"
-"POT-Creation-Date: 2020-02-13 20:41+0100\n"
+"POT-Creation-Date: 2020-07-07 12:22+0200\n"
 "PO-Revision-Date: 2011-07-09 12:12+0800\n"
 "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -16,124 +16,124 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/abd/gnunet-abd.c:397 src/namestore/gnunet-namestore.c:1271
+#: src/abd/gnunet-abd.c:397 src/namestore/gnunet-namestore.c:1302
 #, c-format
 msgid "Ego `%s' not known to identity service\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:413 src/abd/gnunet-abd.c:886
+#: src/abd/gnunet-abd.c:413 src/abd/gnunet-abd.c:896
 #, fuzzy, c-format
 msgid "Issuer public key `%s' is not well-formed\n"
 msgstr "“%s�的�数无效。\n"
 
-#: src/abd/gnunet-abd.c:558 src/abd/gnunet-service-abd.c:1747
+#: src/abd/gnunet-abd.c:560 src/abd/gnunet-service-abd.c:1747
 #: src/namestore/gnunet-namestore.c:1001
-#: src/namestore/gnunet-namestore-fcfsd.c:1153
+#: src/namestore/gnunet-namestore-fcfsd.c:1154
 #, fuzzy, c-format
 msgid "Failed to connect to namestore\n"
 msgstr "�始化“%s��务失败。\n"
 
-#: src/abd/gnunet-abd.c:825 src/abd/gnunet-abd.c:876
+#: src/abd/gnunet-abd.c:835 src/abd/gnunet-abd.c:886
 #, fuzzy, c-format
 msgid "Issuer public key not well-formed\n"
 msgstr "“%s�的�数无效。\n"
 
-#: src/abd/gnunet-abd.c:834 src/abd/gnunet-abd.c:895
+#: src/abd/gnunet-abd.c:844 src/abd/gnunet-abd.c:905
 #, fuzzy, c-format
 msgid "Failed to connect to ABD\n"
 msgstr "�始化“%s��务失败。\n"
 
-#: src/abd/gnunet-abd.c:840
+#: src/abd/gnunet-abd.c:850
 #, c-format
 msgid "You must provide issuer the attribute\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:847
+#: src/abd/gnunet-abd.c:857
 #, c-format
 msgid "ego required\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:857
+#: src/abd/gnunet-abd.c:867
 #, c-format
 msgid "Subject public key needed\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:866
+#: src/abd/gnunet-abd.c:876
 #, fuzzy, c-format
 msgid "Subject public key `%s' is not well-formed\n"
 msgstr "“%s�的�数无效。\n"
 
-#: src/abd/gnunet-abd.c:901
+#: src/abd/gnunet-abd.c:911
 #, c-format
 msgid "You must provide issuer and subject attributes\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:957
+#: src/abd/gnunet-abd.c:970
 #, c-format
 msgid "Please specify name to lookup, subject key and issuer key!\n"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:978
+#: src/abd/gnunet-abd.c:991
 msgid "verify credential against attribute"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:985
+#: src/abd/gnunet-abd.c:998
 msgid ""
 "The public key of the subject to lookup thecredential for, or for issuer "
 "side storage: subject and its attributes"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:992
+#: src/abd/gnunet-abd.c:1005
 msgid "The private, signed delegate presented by the subject"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:999
+#: src/abd/gnunet-abd.c:1012
 msgid "The public key of the authority to verify the credential against"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1004
+#: src/abd/gnunet-abd.c:1017
 #, fuzzy
 msgid "The ego/zone name to use"
 msgstr "消�尺寸"
 
-#: src/abd/gnunet-abd.c:1010
+#: src/abd/gnunet-abd.c:1023
 msgid "The issuer attribute to verify against or to issue"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1016
+#: src/abd/gnunet-abd.c:1029
 msgid ""
 "The time to live for the credential.e.g. 5m, 6h, \"1990-12-30 12:00:00\""
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1021
+#: src/abd/gnunet-abd.c:1034
 msgid "collect credentials"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1026
+#: src/abd/gnunet-abd.c:1039
 msgid "Create and issue a credential issuer side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1031
+#: src/abd/gnunet-abd.c:1044
 msgid "Issue a credential subject side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1036
+#: src/abd/gnunet-abd.c:1049
 msgid "Create, sign and return a credential subject side."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1043
+#: src/abd/gnunet-abd.c:1056
 msgid "Import signed credentials that should be issued to a zone/ego"
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1047
+#: src/abd/gnunet-abd.c:1060
 msgid "Create private record entry."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1053 src/abd/gnunet-abd.c:1059
+#: src/abd/gnunet-abd.c:1066 src/abd/gnunet-abd.c:1072
 msgid "Indicates that the collect/verify process is done via forward search."
 msgstr ""
 
-#: src/abd/gnunet-abd.c:1072
+#: src/abd/gnunet-abd.c:1085
 #, fuzzy
 msgid "GNUnet abd resolver tool"
 msgstr "GNUnet 错误日志"
@@ -377,28 +377,28 @@ msgstr ""
 #: src/transport/plugin_transport_tcp.c:1129
 #: src/transport/plugin_transport_tcp.c:3706
 #: src/transport/tcp_service_legacy.c:594
-#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1091
-#: src/util/service.c:1097
+#: src/transport/tcp_service_legacy.c:600 src/util/service.c:1090
+#: src/util/service.c:1096
 #, c-format
 msgid "Require valid port number for service `%s' in configuration!\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:452 src/transport/plugin_transport_tcp.c:1163
 #: src/transport/tcp_service_legacy.c:634 src/util/client.c:527
-#: src/util/service.c:1130
+#: src/util/service.c:1129
 #, c-format
 msgid "UNIXPATH `%s' too long, maximum length is %llu\n"
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:456 src/transport/plugin_transport_tcp.c:1167
 #: src/transport/tcp_service_legacy.c:638 src/util/client.c:532
-#: src/util/service.c:1134
+#: src/util/service.c:1133
 #, fuzzy, c-format
 msgid "Using `%s' instead\n"
 msgstr "%s：选项“%s�有歧义\n"
 
 #: src/arm/gnunet-service-arm.c:484 src/transport/plugin_transport_tcp.c:1195
-#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1154
+#: src/transport/tcp_service_legacy.c:666 src/util/service.c:1153
 #, c-format
 msgid ""
 "Disabling UNIX domain socket support for service `%s', failed to create UNIX "
@@ -406,7 +406,7 @@ msgid ""
 msgstr ""
 
 #: src/arm/gnunet-service-arm.c:505 src/transport/plugin_transport_tcp.c:1213
-#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1172
+#: src/transport/tcp_service_legacy.c:684 src/util/service.c:1171
 #, c-format
 msgid "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"
 msgstr ""
@@ -414,7 +414,7 @@ msgstr ""
 #: src/arm/gnunet-service-arm.c:536
 #: src/transport/plugin_transport_http_server.c:2718
 #: src/transport/plugin_transport_tcp.c:1244
-#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1203
+#: src/transport/tcp_service_legacy.c:715 src/util/service.c:1202
 #, fuzzy, c-format
 msgid "Failed to resolve `%s': %s\n"
 msgstr "打开日志文件“%s�失败：%s\n"
@@ -422,7 +422,7 @@ msgstr "打开日志文件“%s�失败：%s\n"
 #: src/arm/gnunet-service-arm.c:555
 #: src/transport/plugin_transport_http_server.c:2736
 #: src/transport/plugin_transport_tcp.c:1263
-#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1222
+#: src/transport/tcp_service_legacy.c:734 src/util/service.c:1221
 #, fuzzy, c-format
 msgid "Failed to find %saddress for `%s'.\n"
 msgstr "找�到接�“%s�的一个 IP 地�。\n"
@@ -561,12 +561,12 @@ msgstr ""
 msgid "Failed to initialize solver `%s'!\n"
 msgstr "无法�始化 SQLite：%s。\n"
 
-#: src/ats/plugin_ats_proportional.c:1140
+#: src/ats/plugin_ats_proportional.c:1142
 #, fuzzy, c-format
 msgid "Invalid %s configuration %f \n"
 msgstr "解��置文件“%s�失败\n"
 
-#: src/ats/plugin_ats_proportional.c:1163
+#: src/ats/plugin_ats_proportional.c:1165
 #, fuzzy, c-format
 msgid "Invalid %s configuration %f\n"
 msgstr "解��置文件“%s�失败\n"
@@ -755,7 +755,7 @@ msgstr ""
 
 #: src/auction/gnunet-auction-info.c:77 src/auction/gnunet-auction-join.c:77
 #: src/conversation/gnunet-conversation-test.c:256
-#: src/revocation/gnunet-revocation.c:524 src/template/gnunet-template.c:75
+#: src/revocation/gnunet-revocation.c:552 src/template/gnunet-template.c:75
 msgid "help text"
 msgstr ""
 
@@ -1365,12 +1365,12 @@ msgstr ""
 msgid "# messages of type %u discarded (client busy)"
 msgstr ""
 
-#: src/core/gnunet-service-core.c:926
+#: src/core/gnunet-service-core.c:927
 #, fuzzy
 msgid "Core service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "立��存�置？"
 
-#: src/core/gnunet-service-core.c:945
+#: src/core/gnunet-service-core.c:955
 #, fuzzy, c-format
 msgid "Core service of `%s' ready.\n"
 msgstr "�务已删除。\n"
@@ -1400,112 +1400,112 @@ msgstr ""
 msgid "# PING messages transmitted"
 msgstr "消�尺寸"
 
-#: src/core/gnunet-service-core_kx.c:978
+#: src/core/gnunet-service-core_kx.c:979
 msgid "# old ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:992
+#: src/core/gnunet-service-core_kx.c:993
 msgid "# duplicate ephemeral keys ignored"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1027
+#: src/core/gnunet-service-core_kx.c:1028
 msgid "# EPHEMERAL_KEYs rejected (bad signature)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1045
+#: src/core/gnunet-service-core_kx.c:1046
 #, c-format
 msgid ""
 "EPHEMERAL_KEY from peer `%s' rejected as its validity range does not match "
 "our system time (%llu not in [%llu,%llu]).\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1052
+#: src/core/gnunet-service-core_kx.c:1053
 msgid "# EPHEMERAL_KEY messages rejected due to time"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1070
+#: src/core/gnunet-service-core_kx.c:1071
 #, fuzzy
 msgid "# valid ephemeral keys received"
 msgstr "�存�置失败。"
 
-#: src/core/gnunet-service-core_kx.c:1179
+#: src/core/gnunet-service-core_kx.c:1180
 #: src/transport/gnunet-service-transport_validation.c:1133
 msgid "# PING messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1189
+#: src/core/gnunet-service-core_kx.c:1190
 msgid "# PING messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1238
+#: src/core/gnunet-service-core_kx.c:1239
 msgid "# PONG messages created"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1263
+#: src/core/gnunet-service-core_kx.c:1264
 msgid "# sessions terminated by timeout"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1276
+#: src/core/gnunet-service-core_kx.c:1277
 msgid "# keepalive messages sent"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1333
-#: src/transport/gnunet-service-transport_validation.c:1475
+#: src/core/gnunet-service-core_kx.c:1334
+#: src/transport/gnunet-service-transport_validation.c:1476
 msgid "# PONG messages received"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1341
+#: src/core/gnunet-service-core_kx.c:1342
 msgid "# PONG messages dropped (connection down)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1349
+#: src/core/gnunet-service-core_kx.c:1350
 msgid "# PONG messages dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1388
+#: src/core/gnunet-service-core_kx.c:1389
 msgid "# PONG messages decrypted"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1428
+#: src/core/gnunet-service-core_kx.c:1429
 msgid "# session keys confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1440
+#: src/core/gnunet-service-core_kx.c:1441
 msgid "# timeouts prevented via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1449
+#: src/core/gnunet-service-core_kx.c:1450
 msgid "# rekey operations confirmed via PONG"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1625
+#: src/core/gnunet-service-core_kx.c:1626
 msgid "# DATA message dropped (out of order)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1636
+#: src/core/gnunet-service-core_kx.c:1637
 #, c-format
 msgid ""
 "Session to peer `%s' went down due to key expiration (should not happen)\n"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1640
+#: src/core/gnunet-service-core_kx.c:1641
 msgid "# sessions terminated by key expiration"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1718
-#: src/core/gnunet-service-core_kx.c:1745
+#: src/core/gnunet-service-core_kx.c:1719
+#: src/core/gnunet-service-core_kx.c:1746
 msgid "# bytes dropped (duplicates)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1731
+#: src/core/gnunet-service-core_kx.c:1732
 msgid "# bytes dropped (out of sequence)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1776
+#: src/core/gnunet-service-core_kx.c:1777
 msgid "# bytes dropped (ancient message)"
 msgstr ""
 
-#: src/core/gnunet-service-core_kx.c:1785
+#: src/core/gnunet-service-core_kx.c:1786
 msgid "# bytes of payload decrypted"
 msgstr ""
 
@@ -2675,56 +2675,56 @@ msgstr "无法解�“%s�(%s)：%s\n"
 msgid "Short read reading from file `%s'!"
 msgstr ""
 
-#: src/fs/fs_api.c:1141
+#: src/fs/fs_api.c:1173
 #, fuzzy, c-format
 msgid "Failed to resume publishing information `%s': %s\n"
 msgstr "打开日志文件“%s�失败：%s\n"
 
-#: src/fs/fs_api.c:1667
+#: src/fs/fs_api.c:1724
 #, c-format
 msgid "Failure while resuming publishing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:1682
+#: src/fs/fs_api.c:1739
 #, fuzzy, c-format
 msgid "Failed to resume publishing operation `%s': %s\n"
 msgstr "解��置文件“%s�失败\n"
 
-#: src/fs/fs_api.c:2366
+#: src/fs/fs_api.c:2468
 #, c-format
 msgid "Failure while resuming unindexing operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2377
+#: src/fs/fs_api.c:2479
 #, fuzzy, c-format
 msgid "Failed to resume unindexing operation `%s': %s\n"
 msgstr "解��置文件“%s�失败\n"
 
-#: src/fs/fs_api.c:2513 src/fs/fs_api.c:2759
+#: src/fs/fs_api.c:2627 src/fs/fs_api.c:2873
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': %s\n"
 msgstr "打开日志文件“%s�失败：%s\n"
 
-#: src/fs/fs_api.c:2531
+#: src/fs/fs_api.c:2645
 #, fuzzy, c-format
 msgid "Failed to resume sub-search `%s': %s\n"
 msgstr "打开日志文件“%s�失败：%s\n"
 
-#: src/fs/fs_api.c:2547 src/fs/fs_api.c:2567 src/fs/fs_api.c:3058
+#: src/fs/fs_api.c:2661 src/fs/fs_api.c:2681 src/fs/fs_api.c:3180
 #, c-format
 msgid "Failure while resuming search operation `%s': %s\n"
 msgstr ""
 
-#: src/fs/fs_api.c:2749
+#: src/fs/fs_api.c:2863
 #, fuzzy, c-format
 msgid "Failed to resume sub-download `%s': could not open file `%s'\n"
 msgstr "解��置文件“%s�失败\n"
 
-#: src/fs/fs_api.c:3002
+#: src/fs/fs_api.c:3124
 msgid "Could not resume running search, will resume as paused search\n"
 msgstr ""
 
-#: src/fs/fs_api.c:3097
+#: src/fs/fs_api.c:3219
 #, c-format
 msgid "Failure while resuming download operation `%s': %s\n"
 msgstr ""
@@ -2822,17 +2822,17 @@ msgstr ""
 msgid "Failed to open `%s' for writing: %s\n"
 msgstr "打开日志文件“%s�失败：%s\n"
 
-#: src/fs/fs_namespace.c:227
+#: src/fs/fs_namespace.c:233
 #, fuzzy, c-format
 msgid "Failed to write `%s': %s\n"
 msgstr "�行 %s失败：%s %d\n"
 
-#: src/fs/fs_namespace.c:321
+#: src/fs/fs_namespace.c:330
 #, fuzzy, c-format
 msgid "Failed to read `%s': %s\n"
 msgstr "�行 %s失败：%s %d\n"
 
-#: src/fs/fs_namespace.c:463
+#: src/fs/fs_namespace.c:472
 msgid "Failed to connect to datastore."
 msgstr ""
 
@@ -3050,67 +3050,67 @@ msgstr "“%s�的�数无效。\n"
 msgid "Unrecognized URI type"
 msgstr ""
 
-#: src/fs/fs_uri.c:1072 src/fs/fs_uri.c:1099
+#: src/fs/fs_uri.c:1071 src/fs/fs_uri.c:1098
 msgid "No keywords specified!\n"
 msgstr ""
 
-#: src/fs/fs_uri.c:1105
+#: src/fs/fs_uri.c:1104
 msgid "Number of double-quotes not balanced!\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:230
+#: src/fs/gnunet-auto-share.c:234
 #, fuzzy, c-format
 msgid "Failed to load state: %s\n"
 msgstr "�行 %s失败：%s %d\n"
 
-#: src/fs/gnunet-auto-share.c:278 src/fs/gnunet-auto-share.c:287
-#: src/fs/gnunet-auto-share.c:295
+#: src/fs/gnunet-auto-share.c:286 src/fs/gnunet-auto-share.c:295
+#: src/fs/gnunet-auto-share.c:303
 #, fuzzy, c-format
 msgid "Failed to save state to file %s\n"
 msgstr "解��置文件“%s�失败\n"
 
-#: src/fs/gnunet-auto-share.c:392
+#: src/fs/gnunet-auto-share.c:400
 #, c-format
 msgid "Publication of `%s' done\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:471
+#: src/fs/gnunet-auto-share.c:479
 #, c-format
 msgid "Publishing `%s'\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:483
+#: src/fs/gnunet-auto-share.c:491
 #, fuzzy, c-format
 msgid "Failed to run `%s'\n"
 msgstr "�行 %s失败：%s %d\n"
 
-#: src/fs/gnunet-auto-share.c:653
+#: src/fs/gnunet-auto-share.c:661
 #, c-format
 msgid ""
 "You must specify one and only one directory name for automatic publication.\n"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:703 src/fs/gnunet-publish.c:888
+#: src/fs/gnunet-auto-share.c:711 src/fs/gnunet-publish.c:888
 msgid "set the desired LEVEL of sender-anonymity"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:710
+#: src/fs/gnunet-auto-share.c:718
 msgid "disable adding the creation time to the metadata of the uploaded file"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:716 src/fs/gnunet-publish.c:893
+#: src/fs/gnunet-auto-share.c:724 src/fs/gnunet-publish.c:893
 msgid "do not use libextractor to add keywords or metadata"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:723 src/fs/gnunet-publish.c:938
+#: src/fs/gnunet-auto-share.c:731 src/fs/gnunet-publish.c:938
 msgid "specify the priority of the content"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:730 src/fs/gnunet-publish.c:951
+#: src/fs/gnunet-auto-share.c:738 src/fs/gnunet-publish.c:951
 msgid "set the desired replication LEVEL"
 msgstr ""
 
-#: src/fs/gnunet-auto-share.c:753
+#: src/fs/gnunet-auto-share.c:761
 msgid "Automatically publish files from a directory on GNUnet"
 msgstr ""
 
@@ -3524,7 +3524,7 @@ msgstr ""
 msgid "FS service is lacking HOSTKEY configuration setting.  Exiting.\n"
 msgstr "立��存�置？"
 
-#: src/fs/gnunet-service-fs.c:1307 src/hostlist/gnunet-daemon-hostlist.c:355
+#: src/fs/gnunet-service-fs.c:1316 src/hostlist/gnunet-daemon-hostlist.c:343
 #: src/topology/gnunet-daemon-topology.c:1098
 #, fuzzy, c-format
 msgid "Failed to connect to `%s' service.\n"
@@ -3639,40 +3639,40 @@ msgid "# migration stop messages sent"
 msgstr ""
 
 #: src/fs/gnunet-service-fs_indexing.c:130
-#: src/fs/gnunet-service-fs_indexing.c:185
+#: src/fs/gnunet-service-fs_indexing.c:188
 #, fuzzy, c-format
 msgid "Could not open `%s'.\n"
 msgstr "无法解�“%s�(%s)：%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:144
+#: src/fs/gnunet-service-fs_indexing.c:147
 #, fuzzy, c-format
 msgid "Error writing `%s'.\n"
 msgstr "创建用户出错"
 
-#: src/fs/gnunet-service-fs_indexing.c:241
+#: src/fs/gnunet-service-fs_indexing.c:244
 #, fuzzy, c-format
 msgid "Failed to delete bogus block: %s\n"
 msgstr "打开日志文件“%s�失败：%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:314
+#: src/fs/gnunet-service-fs_indexing.c:317
 msgid "# index blocks removed: original file inaccessible"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:328
+#: src/fs/gnunet-service-fs_indexing.c:331
 #, fuzzy, c-format
 msgid "Could not access indexed file `%s' (%s) at offset %llu: %s\n"
 msgstr "无法解�“%s�(%s)：%s\n"
 
-#: src/fs/gnunet-service-fs_indexing.c:332
+#: src/fs/gnunet-service-fs_indexing.c:335
 msgid "not indexed"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:346
+#: src/fs/gnunet-service-fs_indexing.c:349
 #, c-format
 msgid "Indexed file `%s' changed at offset %llu\n"
 msgstr ""
 
-#: src/fs/gnunet-service-fs_indexing.c:452
+#: src/fs/gnunet-service-fs_indexing.c:455
 #, c-format
 msgid ""
 "Index request received for file `%s' is already indexed as `%s'.  Permitting "
@@ -3846,67 +3846,67 @@ msgstr ""
 msgid "Expected a base32-encoded public zone key\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:132
+#: src/gns/gnunet-bcd.c:133
 #, c-format
 msgid "Refusing `%s' request to HTTP server\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:346
+#: src/gns/gnunet-bcd.c:347
 #, c-format
 msgid "Invalid port number %u.  Exiting.\n"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:351
+#: src/gns/gnunet-bcd.c:352
 #, fuzzy, c-format
 msgid "Businesscard HTTP server starts on %u\n"
 msgstr "�始化“%s��务失败。\n"
 
-#: src/gns/gnunet-bcd.c:371
+#: src/gns/gnunet-bcd.c:372
 #, fuzzy, c-format
 msgid "Could not start businesscard HTTP server on port %u\n"
 msgstr "�始化“%s��务失败。\n"
 
-#: src/gns/gnunet-bcd.c:508
+#: src/gns/gnunet-bcd.c:509
 msgid "Run HTTP serve on port PORT (default is 8888)"
 msgstr ""
 
-#: src/gns/gnunet-bcd.c:521
+#: src/gns/gnunet-bcd.c:522
 msgid "GNUnet HTTP server to create business cards"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:213
+#: src/gns/gnunet-dns2gns.c:239
 #, fuzzy
 msgid "Failed to pack DNS response into UDP packet!\n"
 msgstr "打开日志文件“%s�失败：%s\n"
 
-#: src/gns/gnunet-dns2gns.c:418
+#: src/gns/gnunet-dns2gns.c:442
 #, c-format
 msgid "Cannot parse DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:434
+#: src/gns/gnunet-dns2gns.c:458
 #, c-format
 msgid "Received malformed DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:442
+#: src/gns/gnunet-dns2gns.c:466
 #, c-format
 msgid "Received unsupported DNS request from %s\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:603
+#: src/gns/gnunet-dns2gns.c:627
 msgid "No DNS server specified!\n"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:752
+#: src/gns/gnunet-dns2gns.c:776
 msgid "IP of recursive DNS resolver to use (required)"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:758
+#: src/gns/gnunet-dns2gns.c:782
 msgid "UDP port to listen on for inbound DNS requests; default: 2853"
 msgstr ""
 
-#: src/gns/gnunet-dns2gns.c:775
+#: src/gns/gnunet-dns2gns.c:799
 msgid "GNUnet DNS-to-GNS proxy (a DNS server)"
 msgstr ""
 
@@ -4045,44 +4045,44 @@ msgstr "无法�存�置文件“%s�："
 msgid "Failed to start HTTPS server for `%s'\n"
 msgstr "�始化“%s��务失败。\n"
 
-#: src/gns/gnunet-gns-proxy.c:2922 src/rest/gnunet-rest-server.c:709
+#: src/gns/gnunet-gns-proxy.c:2922 src/rest/gnunet-rest-server.c:713
 #, fuzzy
 msgid "Failed to pass client to MHD\n"
 msgstr "�始化“%s��务失败。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3268
+#: src/gns/gnunet-gns-proxy.c:3271
 #, fuzzy, c-format
 msgid "Unsupported socks version %d\n"
 msgstr "未知的命令“%s�。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3300
+#: src/gns/gnunet-gns-proxy.c:3303
 #, fuzzy, c-format
 msgid "Unsupported socks command %d\n"
 msgstr "未知的命令“%s�。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3386
+#: src/gns/gnunet-gns-proxy.c:3389
 #, fuzzy, c-format
 msgid "Unsupported socks address type %d\n"
 msgstr "未知的命令“%s�。\n"
 
-#: src/gns/gnunet-gns-proxy.c:3727
+#: src/gns/gnunet-gns-proxy.c:3730
 #, fuzzy, c-format
 msgid "Failed to load X.509 key and certificate from `%s'\n"
 msgstr "解��置文件“%s�失败\n"
 
-#: src/gns/gnunet-gns-proxy.c:3861
+#: src/gns/gnunet-gns-proxy.c:3864
 msgid "listen on specified port (default: 7777)"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3866
+#: src/gns/gnunet-gns-proxy.c:3869
 msgid "pem file to use as CA"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3870
+#: src/gns/gnunet-gns-proxy.c:3873
 msgid "disable use of IPv6"
 msgstr ""
 
-#: src/gns/gnunet-gns-proxy.c:3896
+#: src/gns/gnunet-gns-proxy.c:3899
 msgid "GNUnet GNS proxy"
 msgstr ""
 
@@ -4127,51 +4127,51 @@ msgstr ""
 msgid "Service `%s' not a port, skipping service labels.\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:932
+#: src/gns/gnunet-service-gns_resolver.c:938
 #, fuzzy
 msgid "Failed to parse DNS response\n"
 msgstr "打开日志文件“%s�失败：%s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:1123
+#: src/gns/gnunet-service-gns_resolver.c:1129
 #, c-format
 msgid "Skipping record of unsupported type %d\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1439
+#: src/gns/gnunet-service-gns_resolver.c:1447
 #, c-format
 msgid "VPN returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1896
+#: src/gns/gnunet-service-gns_resolver.c:1909
 #, c-format
 msgid "Name `%s' cannot be converted to IDNA."
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1909
+#: src/gns/gnunet-service-gns_resolver.c:1922
 #, c-format
 msgid "GNS lookup resulted in DNS name that is too long (`%s')\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:1952
+#: src/gns/gnunet-service-gns_resolver.c:1965
 #, fuzzy, c-format
 msgid "GNS lookup failed (zero records found for `%s')\n"
 msgstr "�行 %s失败：%s %d\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2372
+#: src/gns/gnunet-service-gns_resolver.c:2385
 msgid "GNS lookup recursion failed (no delegation record found)\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2395
+#: src/gns/gnunet-service-gns_resolver.c:2408
 #, fuzzy, c-format
 msgid "Failed to cache GNS resolution: %s\n"
 msgstr "打开日志文件“%s�失败：%s\n"
 
-#: src/gns/gnunet-service-gns_resolver.c:2563
+#: src/gns/gnunet-service-gns_resolver.c:2576
 #, c-format
 msgid "GNS namecache returned empty result for `%s'\n"
 msgstr ""
 
-#: src/gns/gnunet-service-gns_resolver.c:2703
+#: src/gns/gnunet-service-gns_resolver.c:2716
 #, c-format
 msgid "Zone %s was revoked, resolution fails\n"
 msgstr ""
@@ -4201,7 +4201,7 @@ msgstr "解��置文件“%s�失败\n"
 msgid "Unable to parse BOX record string `%s'\n"
 msgstr "解��置文件“%s�失败\n"
 
-#: src/gns/plugin_rest_gns.c:443
+#: src/gns/plugin_rest_gns.c:445
 msgid "Gns REST API initialized\n"
 msgstr ""
 
@@ -4349,31 +4349,31 @@ msgstr ""
 msgid "Failed to parse `%s' as an address for plugin `%s'\n"
 msgstr "找�到接�“%s�的一个 IP 地�。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist.c:316
+#: src/hostlist/gnunet-daemon-hostlist.c:306
 msgid ""
 "None of the functions for the hostlist daemon were enabled.  I have no "
 "reason to run!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:377
+#: src/hostlist/gnunet-daemon-hostlist.c:364
 msgid "advertise our hostlist to other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:383
+#: src/hostlist/gnunet-daemon-hostlist.c:369
 msgid ""
 "bootstrap using hostlists (it is highly recommended that you always use this "
 "option)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:388
+#: src/hostlist/gnunet-daemon-hostlist.c:374
 msgid "enable learning about hostlist servers from other peers"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:393
+#: src/hostlist/gnunet-daemon-hostlist.c:378
 msgid "provide a hostlist server"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist.c:409
+#: src/hostlist/gnunet-daemon-hostlist.c:393
 msgid "GNUnet hostlist server and client"
 msgstr ""
 
@@ -4397,7 +4397,7 @@ msgid "# valid HELLOs downloaded from hostlist servers"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:677
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1455
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1459
 msgid "# advertised hostlist URIs"
 msgstr ""
 
@@ -4448,7 +4448,7 @@ msgid "# hostlist downloads initiated"
 msgstr ""
 
 #: src/hostlist/gnunet-daemon-hostlist_client.c:1144
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1715
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1726
 msgid "# milliseconds between hostlist downloads"
 msgstr ""
 
@@ -4477,65 +4477,65 @@ msgstr ""
 msgid "Could not open file `%s' for reading to load hostlists: %s\n"
 msgstr "无法解�“%s��确定已方的 IP 地�：%s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1448
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1452
 #, c-format
 msgid "%u hostlist URIs loaded from file\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1451
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1455
 msgid "# hostlist URIs read from file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1502
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1506
 #, fuzzy, c-format
 msgid "Could not open file `%s' for writing to save hostlists: %s\n"
 msgstr "无法解�“%s��确定已方的 IP 地�：%s\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1509
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1513
 #, c-format
 msgid "Writing %u hostlist URIs to `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1534
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1553
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1545
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1564
 #, c-format
 msgid "Error writing hostlist URIs to file `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1547
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1558
 msgid "# hostlist URIs written to file"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1644
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1655
 #: src/transport/plugin_transport_http_client.c:2301
 #, c-format
 msgid "Invalid proxy type: `%s', disabling proxy! Check configuration!\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1673
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1684
 msgid "Learning is enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1686
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1697
 msgid "Learning is not enabled on this peer\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_client.c:1700
+#: src/hostlist/gnunet-daemon-hostlist_client.c:1711
 #, c-format
 msgid ""
 "Since learning is not enabled on this peer, hostlist file `%s' was removed\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:172
+#: src/hostlist/gnunet-daemon-hostlist_server.c:173
 msgid "bytes in hostlist"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:198
+#: src/hostlist/gnunet-daemon-hostlist_server.c:199
 msgid "expired addresses encountered"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:235
-#: src/hostlist/gnunet-daemon-hostlist_server.c:526
+#: src/hostlist/gnunet-daemon-hostlist_server.c:236
+#: src/hostlist/gnunet-daemon-hostlist_server.c:527
 #: src/peerinfo-tool/gnunet-peerinfo.c:379
 #: src/peerinfo-tool/gnunet-peerinfo.c:515
 #: src/topology/gnunet-daemon-topology.c:799
@@ -4543,195 +4543,200 @@ msgstr ""
 msgid "Error in communication with PEERINFO service: %s\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:256
+#: src/hostlist/gnunet-daemon-hostlist_server.c:257
 msgid "HELLOs without addresses encountered (ignored)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:274
+#: src/hostlist/gnunet-daemon-hostlist_server.c:275
 msgid "bytes not included in hostlist (size limit)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:376
+#: src/hostlist/gnunet-daemon-hostlist_server.c:377
 #, c-format
 msgid "Refusing `%s' request to hostlist server\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:380
+#: src/hostlist/gnunet-daemon-hostlist_server.c:381
 msgid "hostlist requests refused (not HTTP GET)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:393
+#: src/hostlist/gnunet-daemon-hostlist_server.c:394
 #, c-format
 msgid "Refusing `%s' request with %llu bytes of upload data\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:398
+#: src/hostlist/gnunet-daemon-hostlist_server.c:399
 msgid "hostlist requests refused (upload data)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:408
+#: src/hostlist/gnunet-daemon-hostlist_server.c:409
 msgid "Could not handle hostlist request since I do not have a response yet\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:411
+#: src/hostlist/gnunet-daemon-hostlist_server.c:412
 msgid "hostlist requests refused (not ready)"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:417
+#: src/hostlist/gnunet-daemon-hostlist_server.c:418
 msgid "Received request for our hostlist\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:419
+#: src/hostlist/gnunet-daemon-hostlist_server.c:420
 msgid "hostlist requests processed"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:460
+#: src/hostlist/gnunet-daemon-hostlist_server.c:461
 msgid "# hostlist advertisements send"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:673
-#: src/transport/gnunet-service-transport.c:2657
+#: src/hostlist/gnunet-daemon-hostlist_server.c:674
+#: src/transport/gnunet-service-transport.c:2659
 msgid "Could not access PEERINFO service.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:684
+#: src/hostlist/gnunet-daemon-hostlist_server.c:685
 #, c-format
 msgid "Invalid port number %llu.  Exiting.\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:696
+#: src/hostlist/gnunet-daemon-hostlist_server.c:697
 #, c-format
 msgid "Hostlist service starts on %s:%llu\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:713
+#: src/hostlist/gnunet-daemon-hostlist_server.c:714
 #, c-format
 msgid "Address to obtain hostlist: `%s'\n"
 msgstr ""
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:728
+#: src/hostlist/gnunet-daemon-hostlist_server.c:729
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "“%s���用。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:742
+#: src/hostlist/gnunet-daemon-hostlist_server.c:743
 #, fuzzy
 msgid "BINDTOIP does not a valid IPv4 address! Ignoring BINDTOIPV6.\n"
 msgstr "“%s���用。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:764
+#: src/hostlist/gnunet-daemon-hostlist_server.c:765
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv4 address! Ignoring BINDTOIPV4.\n"
 msgstr "“%s���用。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:785
+#: src/hostlist/gnunet-daemon-hostlist_server.c:786
 #, fuzzy, c-format
 msgid "`%s' is not a valid IPv6 address! Ignoring BINDTOIPV6.\n"
 msgstr "“%s���用。\n"
 
-#: src/hostlist/gnunet-daemon-hostlist_server.c:828
+#: src/hostlist/gnunet-daemon-hostlist_server.c:829
 #, c-format
 msgid "Could not start hostlist HTTP server on port %u\n"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:193
+#: src/identity/gnunet-identity.c:209
 #, fuzzy, c-format
 msgid "Failed to create ego: %s\n"
 msgstr "��消�失败。\n"
 
-#: src/identity/gnunet-identity.c:233
+#: src/identity/gnunet-identity.c:250
 #, fuzzy, c-format
 msgid "Failed to set default ego: %s\n"
 msgstr "��消�失败。\n"
 
-#: src/identity/gnunet-identity.c:391
+#: src/identity/gnunet-identity.c:445
 msgid "create ego NAME"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:396
+#: src/identity/gnunet-identity.c:450
 msgid "delete ego NAME "
 msgstr ""
 
-#: src/identity/gnunet-identity.c:400
+#: src/identity/gnunet-identity.c:455
+msgid ""
+"set the private key for the identity to PRIVATE_KEY (use together with -C)"
+msgstr ""
+
+#: src/identity/gnunet-identity.c:459
 msgid "display all egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:404
+#: src/identity/gnunet-identity.c:463
 msgid "reduce output"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:411
+#: src/identity/gnunet-identity.c:470
 msgid ""
 "set default identity to NAME for a subsystem SUBSYSTEM (use together with -"
 "s) or restrict results to NAME (use together with -d)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:415
+#: src/identity/gnunet-identity.c:474
 msgid "run in monitor mode egos"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:419
+#: src/identity/gnunet-identity.c:478
 #, fuzzy
 msgid "display private keys as well"
 msgstr "显示一个文件的散列值"
 
-#: src/identity/gnunet-identity.c:426
+#: src/identity/gnunet-identity.c:485
 msgid ""
 "set default identity to EGO for a subsystem SUBSYSTEM (use together with -e)"
 msgstr ""
 
-#: src/identity/gnunet-identity.c:438
+#: src/identity/gnunet-identity.c:500
 msgid "Maintain egos"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:484
+#: src/identity/gnunet-service-identity.c:503
 msgid "no default known"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:507
+#: src/identity/gnunet-service-identity.c:528
 msgid "default configured, but ego unknown (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:597
-#: src/identity/gnunet-service-identity.c:871
-#: src/identity/gnunet-service-identity.c:991
+#: src/identity/gnunet-service-identity.c:621
+#: src/identity/gnunet-service-identity.c:898
+#: src/identity/gnunet-service-identity.c:1018
 #, fuzzy, c-format
 msgid "Failed to write subsystem default identifier map to `%s'.\n"
 msgstr "解��置文件“%s�失败\n"
 
-#: src/identity/gnunet-service-identity.c:607
+#: src/identity/gnunet-service-identity.c:631
 msgid "Unknown ego specified for service (internal error)"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:700
+#: src/identity/gnunet-service-identity.c:726
 msgid "identifier already in use for another ego"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:847
+#: src/identity/gnunet-service-identity.c:874
 msgid "target name already exists"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:889
-#: src/identity/gnunet-service-identity.c:1009
+#: src/identity/gnunet-service-identity.c:916
+#: src/identity/gnunet-service-identity.c:1035
 msgid "no matching ego found"
 msgstr ""
 
-#: src/identity/gnunet-service-identity.c:1043
+#: src/identity/gnunet-service-identity.c:1072
 #, fuzzy, c-format
 msgid "Failed to parse ego information in `%s'\n"
 msgstr "解��置文件“%s�失败\n"
 
-#: src/identity/gnunet-service-identity.c:1099
+#: src/identity/gnunet-service-identity.c:1130
 #, fuzzy, c-format
 msgid "Failed to parse subsystem identity configuration file `%s'\n"
 msgstr "解��置文件“%s�失败\n"
 
-#: src/identity/gnunet-service-identity.c:1108
+#: src/identity/gnunet-service-identity.c:1139
 #, fuzzy, c-format
 msgid "Failed to create directory `%s' for storing egos\n"
 msgstr "解��置文件“%s�失败\n"
 
-#: src/identity/plugin_rest_identity.c:1359
+#: src/identity/plugin_rest_identity.c:1406
 msgid "Identity REST API initialized\n"
 msgstr ""
 
@@ -4780,7 +4785,7 @@ msgstr "“%s�的�数无效。\n"
 msgid "You must specify a name\n"
 msgstr "您必须指定一个接收方�\n"
 
-#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:1608
+#: src/namecache/gnunet-namecache.c:214 src/namestore/gnunet-namestore.c:1639
 msgid "name of the record to add/delete/display"
 msgstr ""
 
@@ -4788,7 +4793,7 @@ msgstr ""
 msgid "specifies the public key of the zone to look in"
 msgstr ""
 
-#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:1669
+#: src/namecache/gnunet-namecache.c:233 src/namestore/gnunet-namestore.c:1700
 #, fuzzy
 msgid "GNUnet zone manipulation tool"
 msgstr "GNUnet �置"
@@ -4897,9 +4902,10 @@ msgstr "打开日志文件“%s�失败：%s\n"
 msgid "No options given\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1014 src/namestore/gnunet-namestore.c:1047
-#: src/namestore/gnunet-namestore.c:1057 src/namestore/gnunet-namestore.c:1075
-#: src/namestore/gnunet-namestore.c:1096 src/namestore/gnunet-namestore.c:1123
+#: src/namestore/gnunet-namestore.c:1014 src/namestore/gnunet-namestore.c:1065
+#: src/namestore/gnunet-namestore.c:1075 src/namestore/gnunet-namestore.c:1104
+#: src/namestore/gnunet-namestore.c:1125 src/namestore/gnunet-namestore.c:1152
+#: src/namestore/gnunet-namestore.c:1228
 #, fuzzy, c-format
 msgid "Missing option `%s' for operation `%s'\n"
 msgstr "�置文件“%s�已写入。\n"
@@ -4908,52 +4914,58 @@ msgstr "�置文件“%s�已写入。\n"
 msgid "replace"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1049 src/namestore/gnunet-namestore.c:1059
-#: src/namestore/gnunet-namestore.c:1077 src/namestore/gnunet-namestore.c:1098
+#: src/namestore/gnunet-namestore.c:1045
+#, fuzzy, c-format
+msgid "Invalid nick `%s'\n"
+msgstr "无效�目。\n"
+
+#: src/namestore/gnunet-namestore.c:1067 src/namestore/gnunet-namestore.c:1077
+#: src/namestore/gnunet-namestore.c:1106 src/namestore/gnunet-namestore.c:1127
+#: src/namestore/gnunet-namestore.c:1230
 msgid "add"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1067
+#: src/namestore/gnunet-namestore.c:1085
 #, fuzzy, c-format
 msgid "Unsupported type `%s'\n"
 msgstr "未知的命令“%s�。\n"
 
-#: src/namestore/gnunet-namestore.c:1086
+#: src/namestore/gnunet-namestore.c:1095
+#, c-format
+msgid "For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"
+msgstr ""
+
+#: src/namestore/gnunet-namestore.c:1115
 #, c-format
 msgid "Value `%s' invalid for record type `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1105
+#: src/namestore/gnunet-namestore.c:1134 src/namestore/gnunet-namestore.c:1237
 #, fuzzy, c-format
 msgid "Invalid time format `%s'\n"
 msgstr "IP 格�无效：“%s�\n"
 
-#: src/namestore/gnunet-namestore.c:1125
+#: src/namestore/gnunet-namestore.c:1154
 msgid "del"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1168
+#: src/namestore/gnunet-namestore.c:1197
 #, fuzzy, c-format
 msgid "Invalid public key for reverse lookup `%s'\n"
 msgstr "“%s�的�数无效。\n"
 
-#: src/namestore/gnunet-namestore.c:1191
+#: src/namestore/gnunet-namestore.c:1220
 #: src/peerinfo-tool/gnunet-peerinfo.c:736
 #, fuzzy, c-format
 msgid "Invalid URI `%s'\n"
 msgstr "无效�目。\n"
 
-#: src/namestore/gnunet-namestore.c:1217
-#, fuzzy, c-format
-msgid "Invalid nick `%s'\n"
-msgstr "无效�目。\n"
-
-#: src/namestore/gnunet-namestore.c:1259
+#: src/namestore/gnunet-namestore.c:1290
 #, c-format
 msgid "Label `%s' contains `.' which is not allowed\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1309
+#: src/namestore/gnunet-namestore.c:1340
 #, c-format
 msgid ""
 "No default identity configured for `namestore' subsystem\n"
@@ -4961,166 +4973,166 @@ msgid ""
 "Run gnunet-identity -d to get a list of choices for $NAME\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1374
+#: src/namestore/gnunet-namestore.c:1405
 #, c-format
 msgid "Superfluous command line arguments (starting with `%s') ignored\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1403
+#: src/namestore/gnunet-namestore.c:1434
 #, fuzzy, c-format
 msgid "Cannot connect to identity service\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/namestore/gnunet-namestore.c:1450
+#: src/namestore/gnunet-namestore.c:1481
 msgid "Empty record line argument is not allowed.\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1462
+#: src/namestore/gnunet-namestore.c:1493
 #, c-format
 msgid "Invalid expiration time `%s' (must be without unit)\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1474 src/namestore/gnunet-namestore.c:1490
-#: src/namestore/gnunet-namestore.c:1507
+#: src/namestore/gnunet-namestore.c:1505 src/namestore/gnunet-namestore.c:1521
+#: src/namestore/gnunet-namestore.c:1538
 #, fuzzy, c-format
 msgid "Missing entries in record line `%s'.\n"
 msgstr "解��置文件“%s�失败\n"
 
-#: src/namestore/gnunet-namestore.c:1482
+#: src/namestore/gnunet-namestore.c:1513
 #, fuzzy, c-format
 msgid "Unknown record type `%s'\n"
 msgstr "未知的命令“%s�。\n"
 
-#: src/namestore/gnunet-namestore.c:1520
+#: src/namestore/gnunet-namestore.c:1551
 #, fuzzy, c-format
 msgid "Invalid record data for type %s: `%s'.\n"
 msgstr "IP 格�无效：“%s�\n"
 
-#: src/namestore/gnunet-namestore.c:1577
+#: src/namestore/gnunet-namestore.c:1608
 msgid "add record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1580
+#: src/namestore/gnunet-namestore.c:1611
 msgid "delete record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1584
+#: src/namestore/gnunet-namestore.c:1615
 msgid "display records"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1591
+#: src/namestore/gnunet-namestore.c:1622
 msgid ""
 "expiration time for record to use (for adding only), \"never\" is possible"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1597
+#: src/namestore/gnunet-namestore.c:1628
 #, fuzzy
 msgid "set the desired nick name for the zone"
 msgstr "无法获�有关用户“%s�的信�：%s\n"
 
-#: src/namestore/gnunet-namestore.c:1602
+#: src/namestore/gnunet-namestore.c:1633
 #, fuzzy
 msgid "monitor changes in the namestore"
 msgstr "�始化“%s��务失败。\n"
 
-#: src/namestore/gnunet-namestore.c:1614
+#: src/namestore/gnunet-namestore.c:1645
 #, fuzzy
 msgid "determine our name for the given PKEY"
 msgstr "无法获�有关用户“%s�的信�：%s\n"
 
-#: src/namestore/gnunet-namestore.c:1621
+#: src/namestore/gnunet-namestore.c:1652
 msgid ""
 "set record set to values given by (possibly multiple) RECORDLINES; can be "
 "specified multiple times"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1627
+#: src/namestore/gnunet-namestore.c:1658
 msgid "type of the record to add/delete/display"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1632
+#: src/namestore/gnunet-namestore.c:1663
 msgid "URI to import into our zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1638
+#: src/namestore/gnunet-namestore.c:1669
 msgid "value of the record to add/delete"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1642
+#: src/namestore/gnunet-namestore.c:1673
 msgid "create or list public record"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1648
+#: src/namestore/gnunet-namestore.c:1679
 msgid ""
 "create shadow record (only valid if all other records of the same type have "
 "expired"
 msgstr ""
 
-#: src/namestore/gnunet-namestore.c:1654
+#: src/namestore/gnunet-namestore.c:1685
 msgid "name of the ego controlling the zone"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:551
+#: src/namestore/gnunet-namestore-fcfsd.c:552
 #, fuzzy, c-format
 msgid "Unsupported form value `%s'\n"
 msgstr "未知的命令“%s�。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:578
+#: src/namestore/gnunet-namestore-fcfsd.c:579
 #, fuzzy, c-format
 msgid "Failed to create record for domain `%s': %s\n"
 msgstr "解��置文件“%s�失败\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:599
+#: src/namestore/gnunet-namestore-fcfsd.c:600
 msgid "Error when mapping zone to name\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:631
+#: src/namestore/gnunet-namestore-fcfsd.c:632
 #, c-format
 msgid "Found existing name `%s' for the given key\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:693
+#: src/namestore/gnunet-namestore-fcfsd.c:694
 #, c-format
 msgid "Found %u existing records for domain `%s'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:783
+#: src/namestore/gnunet-namestore-fcfsd.c:784
 #, fuzzy, c-format
 msgid "Failed to create page for `%s'\n"
 msgstr "��消�失败。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:802
+#: src/namestore/gnunet-namestore-fcfsd.c:803
 #, fuzzy, c-format
 msgid "Failed to setup post processor for `%s'\n"
 msgstr "解��置文件“%s�失败\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:839
+#: src/namestore/gnunet-namestore-fcfsd.c:840
 msgid "Domain name must not contain `.'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:848
+#: src/namestore/gnunet-namestore-fcfsd.c:849
 msgid "Domain name must not contain `+'\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1083
+#: src/namestore/gnunet-namestore-fcfsd.c:1084
 msgid "No ego configured for `fcfsd` subsystem\n"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1114
+#: src/namestore/gnunet-namestore-fcfsd.c:1115
 #, fuzzy
 msgid "Failed to start HTTP server\n"
 msgstr "�始化“%s��务失败。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1162
+#: src/namestore/gnunet-namestore-fcfsd.c:1163
 #, fuzzy
 msgid "Failed to connect to identity\n"
 msgstr "�始化“%s��务失败。\n"
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1189
+#: src/namestore/gnunet-namestore-fcfsd.c:1190
 msgid "name of the zone that is to be managed by FCFSD"
 msgstr ""
 
-#: src/namestore/gnunet-namestore-fcfsd.c:1209
+#: src/namestore/gnunet-namestore-fcfsd.c:1210
 msgid "GNU Name System First Come First Serve name registration service"
 msgstr ""
 
@@ -5156,7 +5168,7 @@ msgstr ""
 msgid "Flat file database running\n"
 msgstr "sqlite 数�仓库"
 
-#: src/namestore/plugin_rest_namestore.c:925
+#: src/namestore/plugin_rest_namestore.c:1093
 msgid "Namestore REST API initialized\n"
 msgstr ""
 
@@ -5468,8 +5480,8 @@ msgstr ""
 msgid "Measure quality and performance of the NSE service."
 msgstr "无法访问该�务"
 
-#: src/nse/gnunet-service-nse.c:1437
-#: src/revocation/gnunet-service-revocation.c:846 src/util/gnunet-scrypt.c:247
+#: src/nse/gnunet-service-nse.c:1438
+#: src/revocation/gnunet-service-revocation.c:842 src/util/gnunet-scrypt.c:250
 #, fuzzy
 msgid "Value is too large.\n"
 msgstr "值�在�法范围内。"
@@ -5539,7 +5551,7 @@ msgid "\tExpires: %s \t %s\n"
 msgstr ""
 
 #: src/peerinfo-tool/gnunet-peerinfo.c:292
-#: src/peerinfo-tool/plugin_rest_peerinfo.c:499
+#: src/peerinfo-tool/plugin_rest_peerinfo.c:501
 #, fuzzy, c-format
 msgid "Failure: Cannot convert address to string for peer `%s'\n"
 msgstr "找�到接�“%s�的一个 IP 地�。\n"
@@ -5620,7 +5632,7 @@ msgstr ""
 msgid "Failed to load transport plugin for `%s'\n"
 msgstr "解��置文件“%s�失败\n"
 
-#: src/peerinfo-tool/plugin_rest_peerinfo.c:795
+#: src/peerinfo-tool/plugin_rest_peerinfo.c:797
 msgid "Peerinfo REST API initialized\n"
 msgstr ""
 
@@ -5726,83 +5738,95 @@ msgstr "�始化“%s��务失败。\n"
 msgid "Daemon to run to perform IP protocol translation to GNUnet"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:617
+#: src/reclaim/gnunet-reclaim.c:799
 #, fuzzy, c-format
 msgid "Ego is required\n"
 msgstr "%s：选项“%s�有歧义\n"
 
-#: src/reclaim/gnunet-reclaim.c:624
+#: src/reclaim/gnunet-reclaim.c:806
 #, c-format
 msgid "Attribute value missing!\n"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:631
+#: src/reclaim/gnunet-reclaim.c:813
 #, fuzzy, c-format
 msgid "Requesting party key is required!\n"
 msgstr "设置�使用的昵称(必须)"
 
-#: src/reclaim/gnunet-reclaim.c:649
+#: src/reclaim/gnunet-reclaim.c:831
 msgid "Add an attribute NAME"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:654
+#: src/reclaim/gnunet-reclaim.c:836
 msgid "Delete the attribute with ID"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:659
+#: src/reclaim/gnunet-reclaim.c:841
 msgid "The attribute VALUE"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:664
+#: src/reclaim/gnunet-reclaim.c:846
 #, fuzzy
 msgid "The EGO to use"
 msgstr "消�尺寸"
 
-#: src/reclaim/gnunet-reclaim.c:670
+#: src/reclaim/gnunet-reclaim.c:852
 msgid "Specify the relying party for issue"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:674
+#: src/reclaim/gnunet-reclaim.c:856
 msgid "List attributes for EGO"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:681
+#: src/reclaim/gnunet-reclaim.c:860
+msgid "List attestations for EGO"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:866
+msgid "Attestation to use for attribute"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:871
+msgid "Attestation name"
+msgstr ""
+
+#: src/reclaim/gnunet-reclaim.c:877
 msgid "Issue a ticket for a set of attributes separated by comma"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:686
+#: src/reclaim/gnunet-reclaim.c:882
 msgid "Consume a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:691
+#: src/reclaim/gnunet-reclaim.c:887
 msgid "Revoke a ticket"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:696
+#: src/reclaim/gnunet-reclaim.c:892
 msgid "Type of attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:700
+#: src/reclaim/gnunet-reclaim.c:896
 msgid "List tickets of ego"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:706
+#: src/reclaim/gnunet-reclaim.c:902
 msgid "Expiration interval of the attribute"
 msgstr ""
 
-#: src/reclaim/gnunet-reclaim.c:714
+#: src/reclaim/gnunet-reclaim.c:910
 msgid "re:claimID command line tool"
 msgstr ""
 
-#: src/reclaim/plugin_rest_openid_connect.c:2340
+#: src/reclaim/plugin_rest_openid_connect.c:2481
 msgid "OpenID Connect REST API initialized\n"
 msgstr ""
 
-#: src/reclaim/plugin_rest_reclaim.c:1899
+#: src/reclaim/plugin_rest_reclaim.c:1476
 msgid "Identity Provider REST API initialized\n"
 msgstr ""
 
-#: src/reclaim/reclaim_api.c:436
+#: src/reclaim/reclaim_api.c:540
 #, fuzzy
 msgid "failed to store record\n"
 msgstr "�行 %s失败：%s %d\n"
@@ -5895,12 +5919,12 @@ msgstr "�务已删除。\n"
 msgid "Search string `%s' is too long!\n"
 msgstr "�务已删除。\n"
 
-#: src/rest/gnunet-rest-server.c:1047
+#: src/rest/gnunet-rest-server.c:1051
 #, fuzzy
 msgid "GNUnet REST server"
 msgstr "GNUnet 错误日志"
 
-#: src/rest/plugin_rest_config.c:401
+#: src/rest/plugin_rest_config.c:402
 msgid "CONFIG REST API initialized\n"
 msgstr ""
 
@@ -5908,138 +5932,156 @@ msgstr ""
 msgid "COPYING REST API initialized\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:127
+#: src/revocation/gnunet-revocation.c:114
+#, fuzzy
+msgid "Shutting down...\n"
+msgstr "未知的命令“%s�。\n"
+
+#: src/revocation/gnunet-revocation.c:146
 #, c-format
 msgid "Key `%s' is valid\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:131
+#: src/revocation/gnunet-revocation.c:150
 #, fuzzy, c-format
 msgid "Key `%s' has been revoked\n"
 msgstr "�务已删除。\n"
 
-#: src/revocation/gnunet-revocation.c:135
+#: src/revocation/gnunet-revocation.c:154
 #, fuzzy
 msgid "Internal error\n"
 msgstr "未知错误。\n"
 
-#: src/revocation/gnunet-revocation.c:161
+#: src/revocation/gnunet-revocation.c:180
 #, c-format
 msgid "Key for ego `%s' is still valid, revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:164
+#: src/revocation/gnunet-revocation.c:183
 msgid "Revocation failed (!)\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:170
+#: src/revocation/gnunet-revocation.c:189
 #, c-format
 msgid "Key for ego `%s' has been successfully revoked\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:173
+#: src/revocation/gnunet-revocation.c:192
 msgid "Revocation successful.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:179
+#: src/revocation/gnunet-revocation.c:198
 msgid "Internal error, key revocation might have failed\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:312
+#: src/revocation/gnunet-revocation.c:251
+msgid "Cancelling calculation.\n"
+msgstr ""
+
+#: src/revocation/gnunet-revocation.c:296
 #, c-format
 msgid "Revocation certificate for `%s' stored in `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:338
+#: src/revocation/gnunet-revocation.c:335
 #, c-format
 msgid "Ego `%s' not found.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:351
+#: src/revocation/gnunet-revocation.c:349
 #, c-format
 msgid "Error: revocation certificate in `%s' is not for `%s'\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:368
+#: src/revocation/gnunet-revocation.c:359
 msgid "Revocation certificate ready\n"
 msgstr ""
 
+#: src/revocation/gnunet-revocation.c:371
+msgid "Continuing calculation where left off...\n"
+msgstr ""
+
 #: src/revocation/gnunet-revocation.c:378
 msgid "Revocation certificate not ready, calculating proof of work\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:409
+#: src/revocation/gnunet-revocation.c:416
 #, fuzzy, c-format
 msgid "Public key `%s' malformed\n"
 msgstr "“%s�的�数无效。\n"
 
-#: src/revocation/gnunet-revocation.c:419
+#: src/revocation/gnunet-revocation.c:426
 msgid ""
 "Testing and revoking at the same time is not allowed, only executing test.\n"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:438
+#: src/revocation/gnunet-revocation.c:456
 #, fuzzy
 msgid "No filename to store revocation certificate given.\n"
 msgstr "解��置文件“%s�失败\n"
 
-#: src/revocation/gnunet-revocation.c:451
+#: src/revocation/gnunet-revocation.c:471
 #, fuzzy, c-format
 msgid "Failed to read revocation certificate from `%s'\n"
 msgstr "解��置文件“%s�失败\n"
 
-#: src/revocation/gnunet-revocation.c:471
+#: src/revocation/gnunet-revocation.c:493
 #, fuzzy
 msgid "No action specified. Nothing to do.\n"
 msgstr "没有指定接�，将使用默认。\n"
 
-#: src/revocation/gnunet-revocation.c:490
+#: src/revocation/gnunet-revocation.c:512
 msgid "use NAME for the name of the revocation file"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:498
+#: src/revocation/gnunet-revocation.c:520
 msgid ""
 "revoke the private key associated for the the private key associated with "
 "the ego NAME "
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:505
+#: src/revocation/gnunet-revocation.c:527
 msgid "actually perform revocation, otherwise we just do the precomputation"
 msgstr ""
 
-#: src/revocation/gnunet-revocation.c:512
+#: src/revocation/gnunet-revocation.c:534
 msgid "test if the public key KEY has been revoked"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:458
+#: src/revocation/gnunet-revocation.c:540
+#, fuzzy
+msgid "number of epochs to calculate for"
+msgstr "迭代次数"
+
+#: src/revocation/gnunet-service-revocation.c:454
 msgid "# unsupported revocations received via set union"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:468
+#: src/revocation/gnunet-service-revocation.c:464
 msgid "# revocation messages received via set union"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:474
+#: src/revocation/gnunet-service-revocation.c:470
 #, c-format
 msgid "Error computing revocation set union with %s\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:478
+#: src/revocation/gnunet-service-revocation.c:474
 #, fuzzy
 msgid "# revocation set unions failed"
 msgstr ""
 "\n"
 "按任�键继续\n"
 
-#: src/revocation/gnunet-service-revocation.c:490
+#: src/revocation/gnunet-service-revocation.c:486
 msgid "# revocation set unions completed"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:530
+#: src/revocation/gnunet-service-revocation.c:526
 msgid "SET service crashed, terminating revocation service\n"
 msgstr ""
 
-#: src/revocation/gnunet-service-revocation.c:871
+#: src/revocation/gnunet-service-revocation.c:881
 #, fuzzy
 msgid "Could not open revocation database file!"
 msgstr "无法连接到 %s:%u：%s\n"
@@ -6228,93 +6270,93 @@ msgstr ""
 msgid "Loading %llu bytes of statistics from `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:409
-#: src/statistics/gnunet-statistics.c:448
+#: src/statistics/gnunet-statistics.c:413
+#: src/statistics/gnunet-statistics.c:455
 #, fuzzy
 msgid "Failed to obtain statistics.\n"
 msgstr "�始化“%s��务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:412
-#: src/statistics/gnunet-statistics.c:451
+#: src/statistics/gnunet-statistics.c:416
+#: src/statistics/gnunet-statistics.c:458
 #, fuzzy, c-format
 msgid "Failed to obtain statistics from host `%s:%llu'\n"
 msgstr "�始化“%s��务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:526
+#: src/statistics/gnunet-statistics.c:532
 msgid "Missing argument: subsystem \n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:532
+#: src/statistics/gnunet-statistics.c:538
 msgid "Missing argument: name\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:571
+#: src/statistics/gnunet-statistics.c:577
 #, c-format
 msgid "No subsystem or name given\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:583
+#: src/statistics/gnunet-statistics.c:589
 #, fuzzy, c-format
 msgid "Failed to initialize watch routine\n"
 msgstr "�始化“%s��务失败。\n"
 
-#: src/statistics/gnunet-statistics.c:710
+#: src/statistics/gnunet-statistics.c:725
 #, fuzzy, c-format
 msgid "Invalid argument `%s'\n"
 msgstr "“%s�的�数无效。\n"
 
-#: src/statistics/gnunet-statistics.c:726
+#: src/statistics/gnunet-statistics.c:742
 #, fuzzy, c-format
 msgid "A port is required to connect to host `%s'\n"
 msgstr "无法连接到 %s:%u：%s\n"
 
-#: src/statistics/gnunet-statistics.c:735
+#: src/statistics/gnunet-statistics.c:751
 #, c-format
 msgid "A port has to be between 1 and 65535 to connect to host `%s'\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:764
+#: src/statistics/gnunet-statistics.c:783
 #, c-format
 msgid "Not able to watch testbed nodes (yet - feel free to implement)\n"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:797
+#: src/statistics/gnunet-statistics.c:816
 msgid "limit output to statistics for the given NAME"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:803
+#: src/statistics/gnunet-statistics.c:821
 msgid "make the value being set persistent"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:810
+#: src/statistics/gnunet-statistics.c:827
 msgid "limit output to the given SUBSYSTEM"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:816
+#: src/statistics/gnunet-statistics.c:832
 msgid "use as csv separator"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:823
+#: src/statistics/gnunet-statistics.c:838
 msgid "path to the folder containing the testbed data"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:829
+#: src/statistics/gnunet-statistics.c:843
 msgid "just print the statistics value"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:834
+#: src/statistics/gnunet-statistics.c:847
 msgid "watch value continuously"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:840
+#: src/statistics/gnunet-statistics.c:852
 msgid "connect to remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:846
+#: src/statistics/gnunet-statistics.c:857
 msgid "port for remote host"
 msgstr ""
 
-#: src/statistics/gnunet-statistics.c:861
+#: src/statistics/gnunet-statistics.c:874
 msgid "Print statistics about GNUnet operations."
 msgstr ""
 
@@ -6406,7 +6448,7 @@ msgid ""
 msgstr ""
 
 #: src/testbed/gnunet-daemon-testbed-underlay.c:234 src/testing/list-keys.c:47
-#: src/testing/testing.c:284 src/util/gnunet-ecc.c:292
+#: src/testing/testing.c:284 src/util/gnunet-ecc.c:318
 #, c-format
 msgid "Incorrect hostkey file format: %s\n"
 msgstr ""
@@ -6792,40 +6834,40 @@ msgstr ""
 msgid "GNUnet topology control"
 msgstr ""
 
-#: src/transport/gnunet-communicator-tcp.c:2227
-#: src/transport/gnunet-communicator-udp.c:2712
-#: src/transport/gnunet-service-tng.c:10024
-#: src/transport/gnunet-service-transport.c:2627
+#: src/transport/gnunet-communicator-tcp.c:2458
+#: src/transport/gnunet-communicator-udp.c:2825
+#: src/transport/gnunet-service-tng.c:10027
+#: src/transport/gnunet-service-transport.c:2624
 #, fuzzy
 msgid "Transport service is lacking key configuration settings. Exiting.\n"
 msgstr "立��存�置？"
 
-#: src/transport/gnunet-communicator-tcp.c:2285
+#: src/transport/gnunet-communicator-tcp.c:2754
 msgid "GNUnet TCP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-udp.c:2784
+#: src/transport/gnunet-communicator-udp.c:2897
 msgid "GNUnet UDP communicator"
 msgstr ""
 
-#: src/transport/gnunet-communicator-unix.c:782
+#: src/transport/gnunet-communicator-unix.c:788
 #, fuzzy
 msgid ""
 "Maximum number of UNIX connections exceeded, dropping incoming message\n"
 msgstr "增加 TCP/IP 的最大连接数"
 
-#: src/transport/gnunet-communicator-unix.c:1009
+#: src/transport/gnunet-communicator-unix.c:1015
 #, fuzzy
 msgid "UNIX communicator is lacking key configuration settings. Exiting.\n"
 msgstr "立��存�置？"
 
-#: src/transport/gnunet-communicator-unix.c:1054
+#: src/transport/gnunet-communicator-unix.c:1060
 #: src/transport/plugin_transport_unix.c:1383
 #, fuzzy, c-format
 msgid "Cannot create path to `%s'\n"
 msgstr "��消�失败。\n"
 
-#: src/transport/gnunet-communicator-unix.c:1132
+#: src/transport/gnunet-communicator-unix.c:1138
 msgid "GNUnet UNIX domain socket communicator"
 msgstr ""
 
@@ -6837,38 +6879,38 @@ msgstr ""
 msgid "# messages dropped due to slow client"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:791
+#: src/transport/gnunet-service-transport.c:794
 msgid "# bytes payload dropped (other peer was not connected)"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1474
+#: src/transport/gnunet-service-transport.c:1477
 msgid "# bytes payload discarded due to not connected peer"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1619
+#: src/transport/gnunet-service-transport.c:1622
 msgid "# bytes total received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:1709
+#: src/transport/gnunet-service-transport.c:1712
 msgid "# bytes payload received"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2013
-#: src/transport/gnunet-service-transport.c:2452
+#: src/transport/gnunet-service-transport.c:2016
+#: src/transport/gnunet-service-transport.c:2450
 msgid "# disconnects due to blacklist"
 msgstr ""
 
-#: src/transport/gnunet-service-transport.c:2456
+#: src/transport/gnunet-service-transport.c:2454
 #, fuzzy, c-format
 msgid "Disallowing connection to peer `%s' on transport %s\n"
 msgstr "解��置文件“%s�失败\n"
 
-#: src/transport/gnunet-service-transport.c:2551
+#: src/transport/gnunet-service-transport.c:2549
 #, fuzzy, c-format
 msgid "Adding blacklisting entry for peer `%s'\n"
 msgstr "�载 GNUnet �务"
 
-#: src/transport/gnunet-service-transport.c:2560
+#: src/transport/gnunet-service-transport.c:2558
 #, c-format
 msgid "Adding blacklisting entry for peer `%s':`%s'\n"
 msgstr ""
@@ -7098,7 +7140,7 @@ msgstr ""
 #: src/transport/gnunet-service-transport_validation.c:489
 #: src/transport/gnunet-service-transport_validation.c:679
 #: src/transport/gnunet-service-transport_validation.c:1000
-#: src/transport/gnunet-service-transport_validation.c:1626
+#: src/transport/gnunet-service-transport_validation.c:1627
 #, fuzzy
 msgid "# validations running"
 msgstr "sqlite 数�仓库"
@@ -7152,32 +7194,32 @@ msgid ""
 "having this address.\n"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1278
+#: src/transport/gnunet-service-transport_validation.c:1279
 #, fuzzy, c-format
 msgid "Failed to create PONG signature for peer `%s'\n"
 msgstr "��消�失败。\n"
 
-#: src/transport/gnunet-service-transport_validation.c:1330
+#: src/transport/gnunet-service-transport_validation.c:1331
 msgid "# PONGs unicast via reliable transport"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1339
+#: src/transport/gnunet-service-transport_validation.c:1340
 msgid "# PONGs multicast to all available addresses"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1514
+#: src/transport/gnunet-service-transport_validation.c:1515
 msgid "# PONGs dropped, no matching pending validation"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1532
+#: src/transport/gnunet-service-transport_validation.c:1533
 msgid "# PONGs dropped, signature expired"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1589
+#: src/transport/gnunet-service-transport_validation.c:1590
 msgid "# validations succeeded"
 msgstr ""
 
-#: src/transport/gnunet-service-transport_validation.c:1644
+#: src/transport/gnunet-service-transport_validation.c:1645
 msgid "# HELLOs given to peerinfo"
 msgstr ""
 
@@ -7778,17 +7820,17 @@ msgstr "“%s�已连接到“%s�。\n"
 msgid "Accepting connection from `%s': %p\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1397
+#: src/transport/tcp_server_legacy.c:478 src/util/service.c:1396
 #, fuzzy, c-format
 msgid "`%s' failed for port %d (%s).\n"
 msgstr "对驱动器“%2$s�的“%1$s��作失败：%3$u\n"
 
-#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1409
+#: src/transport/tcp_server_legacy.c:488 src/util/service.c:1408
 #, c-format
 msgid "`%s' failed for port %d (%s): address already in use\n"
 msgstr ""
 
-#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1416
+#: src/transport/tcp_server_legacy.c:494 src/util/service.c:1415
 #, fuzzy, c-format
 msgid "`%s' failed for `%s': address already in use\n"
 msgstr "对驱动器“%2$s�的“%1$s��作失败：%3$u\n"
@@ -7800,7 +7842,7 @@ msgid ""
 "`GNUNET_SERVER_receive_done' after %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:345 src/util/service.c:834
+#: src/transport/tcp_service_legacy.c:345 src/util/service.c:833
 #, c-format
 msgid "Unknown address family %d\n"
 msgstr ""
@@ -7810,23 +7852,23 @@ msgstr ""
 msgid "Access from `%s' denied to service `%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:410 src/util/service.c:947
+#: src/transport/tcp_service_legacy.c:410 src/util/service.c:946
 #, c-format
 msgid "Could not parse IPv4 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:451 src/util/service.c:988
+#: src/transport/tcp_service_legacy.c:451 src/util/service.c:987
 #, c-format
 msgid "Could not parse IPv6 network specification `%s' for `%s:%s'\n"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:890
-#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1477
+#: src/transport/tcp_service_legacy.c:910 src/util/service.c:1476
 #, c-format
 msgid "Specified value for `%s' of service `%s' is invalid\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1501
+#: src/transport/tcp_service_legacy.c:935 src/util/service.c:1500
 #, c-format
 msgid "Could not access pre-bound socket %u, will try to bind myself\n"
 msgstr ""
@@ -7841,29 +7883,29 @@ msgstr "�行 %s失败：%s %d\n"
 msgid "Service `%s' runs at %s\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1747
+#: src/transport/tcp_service_legacy.c:1193 src/util/service.c:1746
 msgid "Service process failed to initialize\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1752
+#: src/transport/tcp_service_legacy.c:1198 src/util/service.c:1751
 msgid "Service process could not initialize server function\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1757
+#: src/transport/tcp_service_legacy.c:1203 src/util/service.c:1756
 msgid "Service process failed to report status\n"
 msgstr ""
 
-#: src/transport/tcp_service_legacy.c:1253 src/util/disk.c:1177
-#: src/util/service.c:1638
+#: src/transport/tcp_service_legacy.c:1253 src/util/disk.c:1176
+#: src/util/service.c:1637
 #, c-format
 msgid "Cannot obtain information about user `%s': %s\n"
 msgstr "无法获�有关用户“%s�的信�：%s\n"
 
-#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1640
+#: src/transport/tcp_service_legacy.c:1255 src/util/service.c:1639
 msgid "No such user"
 msgstr "无此用户"
 
-#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1654
+#: src/transport/tcp_service_legacy.c:1269 src/util/service.c:1653
 #, c-format
 msgid "Cannot change user/group to `%s': %s\n"
 msgstr "无法更改用户/组为“%s�：%s\n"
@@ -7873,13 +7915,13 @@ msgid "do daemonize (detach from terminal)"
 msgstr ""
 
 #: src/transport/tcp_service_legacy.c:1397
-#: src/transport/transport-testing2.c:906 src/util/service.c:2070
-#: src/util/service.c:2082
+#: src/transport/transport-testing2.c:1061 src/util/service.c:2072
+#: src/util/service.c:2084
 #, fuzzy, c-format
 msgid "Malformed configuration file `%s', exit ...\n"
 msgstr "解��置文件“%s�失败\n"
 
-#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2092
+#: src/transport/tcp_service_legacy.c:1407 src/util/service.c:2094
 #, fuzzy
 msgid "Malformed configuration, exit ...\n"
 msgstr "解��置文件“%s�失败\n"
@@ -7889,39 +7931,89 @@ msgstr "解��置文件“%s�失败\n"
 msgid "Could not access configuration file `%s'\n"
 msgstr "找�到接�“%s�的一个 IP 地�。\n"
 
-#: src/transport/transport_api2_communication.c:704
+#: src/transport/transport_api2_communication.c:743
 msgid "Dropped backchanel message: handler not provided by communicator\n"
 msgstr ""
 
-#: src/util/bio.c:177 src/util/bio.c:185
+#: src/util/bio.c:227 src/util/bio.c:235
 #, fuzzy, c-format
-msgid "Error reading `%s': %s"
+msgid "Error reading `%s' from file: %s"
 msgstr "创建用户出错"
 
-#: src/util/bio.c:187
+#: src/util/bio.c:237
 msgid "End of file"
 msgstr ""
 
-#: src/util/bio.c:244
+#: src/util/bio.c:266
+#, fuzzy, c-format
+msgid "Error while reading `%s' from buffer: %s"
+msgstr "解� dscl 输出时出错。\n"
+
+#: src/util/bio.c:268
+msgid "Not enough data left"
+msgstr ""
+
+#: src/util/bio.c:308
+#, fuzzy, c-format
+msgid "Invalid handle type while reading `%s'"
+msgstr "“%s�的�数无效。\n"
+
+#: src/util/bio.c:335 src/util/bio.c:838
+msgid "string length"
+msgstr ""
+
+#: src/util/bio.c:341
+#, fuzzy, c-format
+msgid "%s (while reading `%s')"
+msgstr "解� dscl 输出时出错。\n"
+
+#: src/util/bio.c:346
 #, c-format
 msgid "Error reading length of string `%s'"
 msgstr ""
 
-#: src/util/bio.c:255
+#: src/util/bio.c:359
 #, c-format
 msgid "String `%s' longer than allowed (%u > %u)"
 msgstr ""
 
-#: src/util/bio.c:303
-#, c-format
-msgid "Serialized metadata `%s' larger than allowed (%u>%u)"
+#: src/util/bio.c:398 src/util/bio.c:863 src/util/bio.c:880
+msgid "metadata length"
 msgstr ""
 
-#: src/util/bio.c:319
+#: src/util/bio.c:410
 #, c-format
-msgid "Metadata `%s' failed to deserialize"
+msgid "Serialized metadata `%s' larger than allowed (%u > %u)"
 msgstr ""
 
+#: src/util/bio.c:426
+#, fuzzy, c-format
+msgid "Failed to deserialize metadata `%s'"
+msgstr "��消�失败。\n"
+
+#: src/util/bio.c:667
+msgid "Unable to flush buffer to file"
+msgstr ""
+
+#: src/util/bio.c:729 src/util/bio.c:750
+#, fuzzy, c-format
+msgid "Error while writing `%s' to file: %s"
+msgstr "解� dscl 输出时出错。\n"
+
+#: src/util/bio.c:731
+msgid "No associated file"
+msgstr ""
+
+#: src/util/bio.c:815
+#, fuzzy, c-format
+msgid "Invalid handle type while writing `%s'"
+msgstr "IP 格�无效：“%s�\n"
+
+#: src/util/bio.c:875
+#, fuzzy, c-format
+msgid "Failed to serialize metadata `%s'"
+msgstr "��消�失败。\n"
+
 #: src/util/client.c:747 src/util/client.c:937
 msgid "not a valid filename"
 msgstr ""
@@ -7931,27 +8023,27 @@ msgstr ""
 msgid "Need a non-empty hostname for service `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:259 src/util/common_logging.c:1112
+#: src/util/common_logging.c:259 src/util/common_logging.c:1114
 msgid "DEBUG"
 msgstr "调试"
 
-#: src/util/common_logging.c:261 src/util/common_logging.c:1110
+#: src/util/common_logging.c:261 src/util/common_logging.c:1112
 msgid "INFO"
 msgstr "信�"
 
-#: src/util/common_logging.c:263 src/util/common_logging.c:1108
+#: src/util/common_logging.c:263 src/util/common_logging.c:1110
 msgid "MESSAGE"
 msgstr ""
 
-#: src/util/common_logging.c:265 src/util/common_logging.c:1106
+#: src/util/common_logging.c:265 src/util/common_logging.c:1108
 msgid "WARNING"
 msgstr "警告"
 
-#: src/util/common_logging.c:267 src/util/common_logging.c:1104
+#: src/util/common_logging.c:267 src/util/common_logging.c:1106
 msgid "ERROR"
 msgstr "错误"
 
-#: src/util/common_logging.c:269 src/util/common_logging.c:1114
+#: src/util/common_logging.c:269 src/util/common_logging.c:1116
 msgid "NONE"
 msgstr ""
 
@@ -7960,29 +8052,29 @@ msgstr ""
 msgid "ERROR: Unable to parse log definition: Syntax error at `%s'.\n"
 msgstr ""
 
-#: src/util/common_logging.c:902
+#: src/util/common_logging.c:904
 #, fuzzy, c-format
 msgid "Message `%.*s' repeated %u times in the last %s\n"
 msgstr "消�“%.*s���了 %u 次，在最近 %llu 秒内\n"
 
-#: src/util/common_logging.c:1115
+#: src/util/common_logging.c:1117
 msgid "INVALID"
 msgstr ""
 
-#: src/util/common_logging.c:1396
+#: src/util/common_logging.c:1398
 msgid "unknown address"
 msgstr ""
 
-#: src/util/common_logging.c:1441
+#: src/util/common_logging.c:1443
 msgid "invalid address"
 msgstr ""
 
-#: src/util/common_logging.c:1460
+#: src/util/common_logging.c:1462
 #, fuzzy, c-format
 msgid "Configuration fails to specify option `%s' in section `%s'!\n"
 msgstr "�置�满足�置规范文件“%s�的约��\n"
 
-#: src/util/common_logging.c:1483
+#: src/util/common_logging.c:1485
 #, fuzzy, c-format
 msgid ""
 "Configuration specifies invalid value for option `%s' in section `%s': %s\n"
@@ -8034,42 +8126,17 @@ msgid ""
 "%llu)\n"
 msgstr ""
 
-#: src/util/crypto_ecc.c:705
+#: src/util/crypto_ecc.c:663
 #, fuzzy, c-format
 msgid "ECC signing failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s�的“%1$s��作失败：%3$u\n"
 
-#: src/util/crypto_ecc.c:822
+#: src/util/crypto_ecc.c:791
 #, fuzzy, c-format
 msgid "ECDSA signature verification failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s�的“%1$s��作失败：%3$u\n"
 
-#: src/util/crypto_ecc_setup.c:136 src/util/crypto_ecc_setup.c:178
-#: src/util/crypto_ecc_setup.c:318 src/util/crypto_ecc_setup.c:360
-#, fuzzy, c-format
-msgid "Could not acquire lock on file `%s': %s...\n"
-msgstr "无法解�“%s�(%s)：%s\n"
-
-#: src/util/crypto_ecc_setup.c:142 src/util/crypto_ecc_setup.c:324
-#, fuzzy
-msgid "Creating a new private key.  This may take a while.\n"
-msgstr "正在�动数�仓库转�(�能需�一段时间)。\n"
-
-#: src/util/crypto_ecc_setup.c:184 src/util/crypto_ecc_setup.c:366
-msgid "This may be ok if someone is currently generating a private key.\n"
-msgstr ""
-
-#: src/util/crypto_ecc_setup.c:220 src/util/crypto_ecc_setup.c:402
-#, c-format
-msgid ""
-"When trying to read key file `%s' I found %u bytes but I need at least %u.\n"
-msgstr ""
-
-#: src/util/crypto_ecc_setup.c:225 src/util/crypto_ecc_setup.c:407
-msgid "This may be ok if someone is currently generating a key.\n"
-msgstr ""
-
-#: src/util/crypto_ecc_setup.c:469
+#: src/util/crypto_ecc_setup.c:369
 #, fuzzy
 msgid "Could not load peer's private key\n"
 msgstr "找�到接�“%s�的一个 IP 地�。\n"
@@ -8079,17 +8146,17 @@ msgstr "找�到接�“%s�的一个 IP 地�。\n"
 msgid "libgcrypt has not the expected version (version %s is required).\n"
 msgstr "libgcrypt 的版本�符�预期(�求版本 %s)。\n"
 
-#: src/util/crypto_rsa.c:956
+#: src/util/crypto_rsa.c:959
 #, fuzzy, c-format
 msgid "RSA signing failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s�的“%1$s��作失败：%3$u\n"
 
-#: src/util/crypto_rsa.c:1314
+#: src/util/crypto_rsa.c:1318
 #, fuzzy, c-format
 msgid "RSA signature verification failed at %s:%d: %s\n"
 msgstr "对驱动器“%2$s�的“%1$s��作失败：%3$u\n"
 
-#: src/util/disk.c:941
+#: src/util/disk.c:940
 #, c-format
 msgid "Expected `%s' to be a directory!\n"
 msgstr "“%s�应为目录�\n"
@@ -8220,41 +8287,52 @@ msgstr ""
 msgid "use configuration file FILENAME"
 msgstr "更改�置文件中的一个值"
 
-#: src/util/getopt_helpers.c:568 src/util/getopt_helpers.c:634
-#: src/util/getopt_helpers.c:835 src/util/getopt_helpers.c:900
+#: src/util/getopt_helpers.c:568 src/util/getopt_helpers.c:859
+#: src/util/getopt_helpers.c:924
 #, c-format
 msgid "You must pass a number to the `%s' option.\n"
 msgstr "您必须�“%s�选项传递一个数字。\n"
 
-#: src/util/getopt_helpers.c:659
+#: src/util/getopt_helpers.c:649
+#, fuzzy, c-format
+msgid ""
+"You must pass a relative time (optionally with sign) to the `%s' option.\n"
+msgstr "您必须�“%s�选项传递一个数字。\n"
+
+#: src/util/getopt_helpers.c:656
+#, c-format
+msgid "Value given for time travel `%s' option is too big.\n"
+msgstr ""
+
+#: src/util/getopt_helpers.c:683
 msgid "[+/-]MICROSECONDS"
 msgstr ""
 
-#: src/util/getopt_helpers.c:661
+#: src/util/getopt_helpers.c:685
 msgid "modify system time by given offset (for debugging/testing only)"
 msgstr ""
 
-#: src/util/getopt_helpers.c:696
+#: src/util/getopt_helpers.c:720
 #, fuzzy, c-format
 msgid "You must pass relative time to the `%s' option.\n"
 msgstr "您必须�“%s�选项传递一个数字。\n"
 
-#: src/util/getopt_helpers.c:761
+#: src/util/getopt_helpers.c:785
 #, fuzzy, c-format
 msgid "You must pass absolute time to the `%s' option.\n"
 msgstr "您必须�“%s�选项传递一个数字。\n"
 
-#: src/util/getopt_helpers.c:828
+#: src/util/getopt_helpers.c:852
 #, c-format
 msgid "Your input for the '%s' option has to be a non negative number\n"
 msgstr ""
 
-#: src/util/getopt_helpers.c:907
+#: src/util/getopt_helpers.c:931
 #, fuzzy, c-format
 msgid "You must pass a number below %u to the `%s' option.\n"
 msgstr "您必须�“%s�选项传递一个数字。\n"
 
-#: src/util/getopt_helpers.c:994
+#: src/util/getopt_helpers.c:1018
 #, c-format
 msgid "Argument `%s' malformed. Expected base32 (Crockford) encoded value.\n"
 msgstr ""
@@ -8328,7 +8406,7 @@ msgstr ""
 msgid "Generating %u keys, please wait"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:175
+#: src/util/gnunet-ecc.c:177
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8349,54 +8427,54 @@ msgid ""
 "Error, %u keys not generated\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:277
+#: src/util/gnunet-ecc.c:303
 #, c-format
 msgid "Hostkeys file `%s' not found\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:287
+#: src/util/gnunet-ecc.c:313
 #, fuzzy, c-format
 msgid "Hostkeys file `%s' is empty\n"
 msgstr "找�到接�“%s�的一个 IP 地�。\n"
 
-#: src/util/gnunet-ecc.c:307
+#: src/util/gnunet-ecc.c:333
 #, fuzzy, c-format
 msgid "Could not read hostkey file: %s\n"
 msgstr "找�到接�“%s�的一个 IP 地�。\n"
 
-#: src/util/gnunet-ecc.c:361
+#: src/util/gnunet-ecc.c:387
 msgid "No hostkey file specified on command line\n"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:425
+#: src/util/gnunet-ecc.c:451
 msgid "list keys included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:431
+#: src/util/gnunet-ecc.c:457
 msgid "number of keys to list included in a file (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:437
+#: src/util/gnunet-ecc.c:463
 msgid "create COUNT public-private key pairs (for testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:442
+#: src/util/gnunet-ecc.c:468
 msgid "print the public key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:447
+#: src/util/gnunet-ecc.c:473
 msgid "print the private key in ASCII format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:452
+#: src/util/gnunet-ecc.c:478
 msgid "print the public key in HEX format"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:458
+#: src/util/gnunet-ecc.c:484
 msgid "print examples of ECC operations (used for compatibility testing)"
 msgstr ""
 
-#: src/util/gnunet-ecc.c:472
+#: src/util/gnunet-ecc.c:498
 #, fuzzy
 msgid "Manipulate GNUnet private ECC key files"
 msgstr "更改�置文件中的一个值"
@@ -8432,32 +8510,32 @@ msgstr ""
 msgid "perform a reverse lookup"
 msgstr ""
 
-#: src/util/gnunet-resolver.c:179
+#: src/util/gnunet-resolver.c:182
 msgid "Use build-in GNUnet stub resolver"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:219
+#: src/util/gnunet-scrypt.c:222
 #, c-format
 msgid "Loading hostkey from `%s' failed.\n"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:285
+#: src/util/gnunet-scrypt.c:288
 msgid "number of bits to require for the proof of work"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:291
+#: src/util/gnunet-scrypt.c:294
 msgid "file with private key, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:297
+#: src/util/gnunet-scrypt.c:300
 msgid "file with proof of work, otherwise default is used"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:303
+#: src/util/gnunet-scrypt.c:306
 msgid "time to wait between calculations"
 msgstr ""
 
-#: src/util/gnunet-scrypt.c:316
+#: src/util/gnunet-scrypt.c:319
 #, fuzzy
 msgid "Manipulate GNUnet proof of work files"
 msgstr "更改�置文件中的一个值"
@@ -8501,19 +8579,19 @@ msgid ""
 "Fatal internal logic error, process hangs in `%s' (abort with CTRL-C)!\n"
 msgstr ""
 
-#: src/util/os_installation.c:408
+#: src/util/os_installation.c:409
 #, fuzzy, c-format
 msgid ""
 "Could not determine installation path for %s.  Set `%s' environment "
 "variable.\n"
 msgstr "无法确定安装路径。请�试设置“%s�\n"
 
-#: src/util/os_installation.c:791
+#: src/util/os_installation.c:792
 #, fuzzy, c-format
 msgid "Could not find binary `%s' in PATH!\n"
 msgstr "找�到主机“%s�的 IP：%s\n"
 
-#: src/util/os_installation.c:824
+#: src/util/os_installation.c:825
 #, c-format
 msgid "Binary `%s' exists, but is not SUID\n"
 msgstr ""
@@ -8591,14 +8669,14 @@ msgstr ""
 msgid "Could not resolve our FQDN: %s\n"
 msgstr "无法解�“%s�(%s)：%s\n"
 
-#: src/util/service.c:654
+#: src/util/service.c:653
 #, c-format
 msgid ""
 "Processing code for message of type %u did not call "
 "`GNUNET_SERVICE_client_continue' after %s\n"
 msgstr ""
 
-#: src/util/service.c:1569
+#: src/util/service.c:1568
 msgid ""
 "Could not bind to any of the ports I was supposed to, refusing to run!\n"
 msgstr ""
@@ -8613,118 +8691,118 @@ msgstr ""
 msgid "Attempting to proxy service `%s' to invalid port %d or hostname.\n"
 msgstr ""
 
-#: src/util/strings.c:177
+#: src/util/strings.c:178
 msgid "b"
 msgstr "b"
 
-#: src/util/strings.c:498
+#: src/util/strings.c:502
 #, c-format
 msgid "Character sets requested were `%s'->`%s'\n"
 msgstr ""
 
-#: src/util/strings.c:622
+#: src/util/strings.c:636
 msgid "Failed to expand `$HOME': environment variable `HOME' not set"
 msgstr "扩展“$HOME�失败：没有设置环境��“HOME�"
 
-#: src/util/strings.c:691
+#: src/util/strings.c:705
 msgid "µs"
 msgstr ""
 
-#: src/util/strings.c:695
+#: src/util/strings.c:709
 msgid "forever"
 msgstr ""
 
-#: src/util/strings.c:697
+#: src/util/strings.c:711
 msgid "0 ms"
 msgstr ""
 
-#: src/util/strings.c:701
+#: src/util/strings.c:715
 msgid "ms"
 msgstr "毫秒"
 
-#: src/util/strings.c:705
+#: src/util/strings.c:719
 msgid "s"
 msgstr "秒"
 
-#: src/util/strings.c:709
+#: src/util/strings.c:723
 msgid "m"
 msgstr "分"
 
-#: src/util/strings.c:713
+#: src/util/strings.c:727
 msgid "h"
 msgstr "æ—¶"
 
-#: src/util/strings.c:719
+#: src/util/strings.c:733
 #, fuzzy
 msgid "day"
 msgstr " 天"
 
-#: src/util/strings.c:721
+#: src/util/strings.c:735
 #, fuzzy
 msgid "days"
 msgstr " 天"
 
-#: src/util/strings.c:749
+#: src/util/strings.c:763
 msgid "end of time"
 msgstr ""
 
-#: src/util/strings.c:1219
+#: src/util/strings.c:1239
 msgid "IPv6 address did not start with `['\n"
 msgstr ""
 
-#: src/util/strings.c:1227
+#: src/util/strings.c:1247
 msgid "IPv6 address did contain ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1234
+#: src/util/strings.c:1254
 msgid "IPv6 address did contain ']' before ':' to separate port number\n"
 msgstr ""
 
-#: src/util/strings.c:1242
+#: src/util/strings.c:1262
 msgid "IPv6 address did contain a valid port number after the last ':'\n"
 msgstr ""
 
-#: src/util/strings.c:1251
+#: src/util/strings.c:1271
 #, fuzzy, c-format
 msgid "Invalid IPv6 address `%s': %s\n"
 msgstr "无效的进程优先级“%s�\n"
 
-#: src/util/strings.c:1479 src/util/strings.c:1490
+#: src/util/strings.c:1498 src/util/strings.c:1509
 msgid "Port not in range\n"
 msgstr ""
 
-#: src/util/strings.c:1499
+#: src/util/strings.c:1518
 #, fuzzy, c-format
 msgid "Malformed port policy `%s'\n"
 msgstr "解��置文件“%s�失败\n"
 
-#: src/util/strings.c:1582 src/util/strings.c:1611 src/util/strings.c:1658
-#: src/util/strings.c:1678
+#: src/util/strings.c:1601 src/util/strings.c:1630 src/util/strings.c:1677
+#: src/util/strings.c:1697
 #, c-format
 msgid "Invalid format for IP: `%s'\n"
 msgstr "IP 格�无效：“%s�\n"
 
-#: src/util/strings.c:1636
+#: src/util/strings.c:1655
 #, c-format
 msgid "Invalid network notation ('/%d' is not legal in IPv4 CIDR)."
 msgstr "网络表示法无效(“/%d� 在 IPv4 CIDR 中是�法的)。"
 
-#: src/util/strings.c:1687
+#: src/util/strings.c:1706
 #, fuzzy, c-format
 msgid "Invalid format: `%s'\n"
 msgstr "IP 格�无效：“%s�\n"
 
-#: src/util/strings.c:1740
+#: src/util/strings.c:1759
 #, c-format
 msgid "Invalid network notation (does not end with ';': `%s')\n"
 msgstr "无效的网络表示法(没有以“;�结尾：“%s�)\n"
 
-#: src/util/strings.c:1790
+#: src/util/strings.c:1809
 #, c-format
 msgid "Wrong format `%s' for netmask\n"
 msgstr "网络掩�的格�“%s�错误\n"
 
-#: src/util/strings.c:1821
+#: src/util/strings.c:1840
 #, c-format
 msgid "Wrong format `%s' for network\n"
 msgstr "网络的格�“%s�错误\n"
@@ -8916,6 +8994,14 @@ msgstr ""
 msgid "Failed to connect to the namestore!\n"
 msgstr "�始化“%s��务失败。\n"
 
+#, fuzzy, c-format
+#~ msgid "Could not acquire lock on file `%s': %s...\n"
+#~ msgstr "无法解�“%s�(%s)：%s\n"
+
+#, fuzzy
+#~ msgid "Creating a new private key.  This may take a while.\n"
+#~ msgstr "正在�动数�仓库转�(�能需�一段时间)。\n"
+
 #, fuzzy
 #~ msgid "Failed to start gnunet-helper-w32-console\n"
 #~ msgstr "�始化“%s��务失败。\n"
@@ -9769,10 +9855,6 @@ msgstr "�始化“%s��务失败。\n"
 #~ msgstr "�行 %s失败：%s %d\n"
 
 #, fuzzy
-#~ msgid "Failed to serialize meta data"
-#~ msgstr "��消�失败。\n"
-
-#, fuzzy
 #~ msgid "Failed to parse URI `%s' from KBlock!\n"
 #~ msgstr "�行 %s失败：%s %d\n"
 
diff --git a/src/abd/gnunet-abd.c b/src/abd/gnunet-abd.c
index f7e03fb4a..ff7dd09c5 100644
--- a/src/abd/gnunet-abd.c
+++ b/src/abd/gnunet-abd.c
@@ -513,8 +513,8 @@ get_existing_record (void *cls,
                      const struct GNUNET_GNSRECORD_Data *rd)
 {
   struct GNUNET_GNSRECORD_Data *rde;
-  struct GNUNET_GNSRECORD_Data* rdn =
-    GNUNET_malloc(sizeof(*rdn)*(rd_count + 1));
+  struct GNUNET_GNSRECORD_Data*rdn =
+    GNUNET_malloc (sizeof(*rdn) * (rd_count + 1));
 
   memset (rdn, 0, sizeof (struct GNUNET_GNSRECORD_Data));
   GNUNET_memcpy (&rdn[1], rd,
@@ -541,7 +541,7 @@ get_existing_record (void *cls,
                                            rde,
                                            &add_continuation,
                                            &add_qe);
-  GNUNET_free(rdn);
+  GNUNET_free (rdn);
   return;
 }
 
@@ -604,13 +604,18 @@ store_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
     if (GNUNET_OK !=
         GNUNET_GNSRECORD_string_to_value (type, subject, &data, &data_size))
     {
-      if(typestring == NULL) {
-        fputs("No value for unknown record type\n", stderr);
-      } else if(subject == NULL) {
-        fprintf(stderr,
-                "No value for record type`%s'\n",
-                typestring);
-      } else {
+      if (typestring == NULL)
+      {
+        fputs ("No value for unknown record type\n", stderr);
+      }
+      else if (subject == NULL)
+      {
+        fprintf (stderr,
+                 "No value for record type`%s'\n",
+                 typestring);
+      }
+      else
+      {
         fprintf (stderr,
                  "Value `%s' invalid for record type `%s'\n",
                  subject,
@@ -723,7 +728,7 @@ sign_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
   GNUNET_free (dele);
   printf ("%s\n", res);
 
-  GNUNET_free_non_null (ego_name);
+  GNUNET_free (ego_name);
   ego_name = NULL;
 
   GNUNET_SCHEDULER_shutdown ();
@@ -927,8 +932,8 @@ run (void *cls,
     int i;
     while (NULL != (tok = strtok (NULL, ",")))
       count++;
-    struct GNUNET_ABD_Delegate* delegates =
-      GNUNET_malloc(sizeof(*delegates)*count);
+    struct GNUNET_ABD_Delegate*delegates =
+      GNUNET_malloc (sizeof(*delegates) * count);
     struct GNUNET_ABD_Delegate *dele;
     GNUNET_free (tmp);
     tmp = GNUNET_strdup (subject_delegate);
@@ -961,7 +966,7 @@ run (void *cls,
       delegates[i].issuer_attribute = NULL;
     }
     GNUNET_free (tmp);
-    GNUNET_free(delegates);
+    GNUNET_free (delegates);
   }
   else
   {
diff --git a/src/abd/gnunet-service-abd.c b/src/abd/gnunet-service-abd.c
index 36b0009ef..569d42295 100644
--- a/src/abd/gnunet-service-abd.c
+++ b/src/abd/gnunet-service-abd.c
@@ -364,14 +364,14 @@ print_deleset (struct DelegationSetQueueEntry *dsentry, char *text)
 static void
 cleanup_dsq_entry (struct DelegationSetQueueEntry *ds_entry)
 {
-  GNUNET_free_non_null (ds_entry->issuer_key);
-  GNUNET_free_non_null (ds_entry->issuer_attribute);
-  GNUNET_free_non_null (ds_entry->attr_trailer);
+  GNUNET_free (ds_entry->issuer_key);
+  GNUNET_free (ds_entry->issuer_attribute);
+  GNUNET_free (ds_entry->attr_trailer);
   // those fields are only set/used in bw search
   if (ds_entry->from_bw)
   {
-    GNUNET_free_non_null (ds_entry->lookup_attribute);
-    GNUNET_free_non_null (ds_entry->unresolved_attribute_delegation);
+    GNUNET_free (ds_entry->lookup_attribute);
+    GNUNET_free (ds_entry->unresolved_attribute_delegation);
   }
   if (NULL != ds_entry->lookup_request)
   {
@@ -380,9 +380,9 @@ cleanup_dsq_entry (struct DelegationSetQueueEntry *ds_entry)
   }
   if (NULL != ds_entry->delegation_chain_entry)
   {
-    GNUNET_free_non_null (
+    GNUNET_free (
       ds_entry->delegation_chain_entry->subject_attribute);
-    GNUNET_free_non_null (ds_entry->delegation_chain_entry->issuer_attribute);
+    GNUNET_free (ds_entry->delegation_chain_entry->issuer_attribute);
     GNUNET_free (ds_entry->delegation_chain_entry);
   }
   // Free DQ entries
@@ -423,11 +423,11 @@ cleanup_handle (struct VerifyRequestHandle *vrh)
       GNUNET_CONTAINER_DLL_remove (vrh->del_chain_head,
                                    vrh->del_chain_tail,
                                    del_entry);
-      GNUNET_free_non_null (del_entry->delegate);
+      GNUNET_free (del_entry->delegate);
       GNUNET_free (del_entry);
     }
   }
-  GNUNET_free_non_null (vrh->issuer_attribute);
+  GNUNET_free (vrh->issuer_attribute);
   GNUNET_free (vrh);
 }
 
diff --git a/src/abd/plugin_gnsrecord_abd.c b/src/abd/plugin_gnsrecord_abd.c
index 850fa9a45..272872e24 100644
--- a/src/abd/plugin_gnsrecord_abd.c
+++ b/src/abd/plugin_gnsrecord_abd.c
@@ -235,7 +235,8 @@ abd_string_to_value (void *cls,
                                            (char *) &sets[1]);
       for (i = 0; i < entries; i++)
       {
-        if (0 != set[i].subject_attribute_len) {
+        if (0 != set[i].subject_attribute_len)
+        {
           GNUNET_free_nz ((char *) set[i].subject_attribute);
           set[i].subject_attribute = NULL;
         }
diff --git a/src/arm/arm_api.c b/src/arm/arm_api.c
index 1c402a8e0..899b6f152 100644
--- a/src/arm/arm_api.c
+++ b/src/arm/arm_api.c
@@ -729,8 +729,7 @@ start_arm_service (struct GNUNET_ARM_Handle *h,
     /* Means we are ONLY running locally */
     /* we're clearly running a test, don't daemonize */
     if (NULL == config)
-      proc = GNUNET_OS_start_process_s (GNUNET_NO,
-                                        std_inheritance,
+      proc = GNUNET_OS_start_process_s (std_inheritance,
                                         lsocks,
                                         loprefix,
                                         quotedbinary,
@@ -738,8 +737,7 @@ start_arm_service (struct GNUNET_ARM_Handle *h,
                                         lopostfix,
                                         NULL);
     else
-      proc = GNUNET_OS_start_process_s (GNUNET_NO,
-                                        std_inheritance,
+      proc = GNUNET_OS_start_process_s (std_inheritance,
                                         lsocks,
                                         loprefix,
                                         quotedbinary,
@@ -752,8 +750,7 @@ start_arm_service (struct GNUNET_ARM_Handle *h,
   else
   {
     if (NULL == config)
-      proc = GNUNET_OS_start_process_s (GNUNET_NO,
-                                        std_inheritance,
+      proc = GNUNET_OS_start_process_s (std_inheritance,
                                         lsocks,
                                         loprefix,
                                         quotedbinary,
@@ -761,8 +758,7 @@ start_arm_service (struct GNUNET_ARM_Handle *h,
                                         lopostfix,
                                         NULL);
     else
-      proc = GNUNET_OS_start_process_s (GNUNET_NO,
-                                        std_inheritance,
+      proc = GNUNET_OS_start_process_s (std_inheritance,
                                         lsocks,
                                         loprefix,
                                         quotedbinary,
@@ -774,7 +770,7 @@ start_arm_service (struct GNUNET_ARM_Handle *h,
   }
   GNUNET_free (binary);
   GNUNET_free (quotedbinary);
-  GNUNET_free_non_null (config);
+  GNUNET_free (config);
   GNUNET_free (loprefix);
   GNUNET_free (lopostfix);
   if (NULL == proc)
@@ -976,10 +972,7 @@ GNUNET_ARM_request_service_start (struct GNUNET_ARM_Handle *h,
      the above check should catch 99.99% of the cases where ARM
      is already running. */LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Starting ARM service\n");
-  if (NULL == (sig = GNUNET_DISK_pipe (GNUNET_NO,
-                                       GNUNET_NO,
-                                       GNUNET_NO,
-                                       GNUNET_YES)))
+  if (NULL == (sig = GNUNET_DISK_pipe (GNUNET_DISK_PF_NONE)))
   {
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING,
                          "pipe");
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c
index 09d85ca89..263c99cc4 100644
--- a/src/arm/gnunet-service-arm.c
+++ b/src/arm/gnunet-service-arm.c
@@ -475,7 +475,7 @@ get_server_addresses (const char *service_name,
           (EACCES == errno))
       {
         LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "socket");
-        GNUNET_free_non_null (hostname);
+        GNUNET_free (hostname);
         GNUNET_free (unixpath);
         return GNUNET_SYSERR;
       }
@@ -504,7 +504,7 @@ get_server_addresses (const char *service_name,
            _ (
              "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"),
            service_name);
-    GNUNET_free_non_null (hostname);
+    GNUNET_free (hostname);
     return GNUNET_SYSERR;
   }
   if (0 == port)
@@ -512,8 +512,8 @@ get_server_addresses (const char *service_name,
     saddrs = GNUNET_new_array (2, struct sockaddr *);
     saddrlens = GNUNET_new_array (2, socklen_t);
     add_unixpath (saddrs, saddrlens, unixpath, abstract);
-    GNUNET_free_non_null (unixpath);
-    GNUNET_free_non_null (hostname);
+    GNUNET_free (unixpath);
+    GNUNET_free (hostname);
     *addrs = saddrs;
     *addr_lens = saddrlens;
     return 1;
@@ -537,7 +537,7 @@ get_server_addresses (const char *service_name,
            hostname,
            gai_strerror (ret));
       GNUNET_free (hostname);
-      GNUNET_free_non_null (unixpath);
+      GNUNET_free (unixpath);
       return GNUNET_SYSERR;
     }
     next = res;
@@ -557,7 +557,7 @@ get_server_addresses (const char *service_name,
            hostname);
       freeaddrinfo (res);
       GNUNET_free (hostname);
-      GNUNET_free_non_null (unixpath);
+      GNUNET_free (unixpath);
       return GNUNET_SYSERR;
     }
     resi = i;
@@ -664,7 +664,7 @@ get_server_addresses (const char *service_name,
       ((struct sockaddr_in *) saddrs[i])->sin_port = htons (port);
     }
   }
-  GNUNET_free_non_null (unixpath);
+  GNUNET_free (unixpath);
   *addrs = saddrs;
   *addr_lens = saddrlens;
   return resi;
@@ -858,8 +858,10 @@ start_process (struct ServiceList *sl,
      * of ''-quoted strings, escaping should be considered. */
     if (NULL != options)
       options = GNUNET_CONFIGURATION_expand_dollar (cfg, options);
-    sl->proc = GNUNET_OS_start_process_s (sl->pipe_control,
-                                          GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+    sl->proc = GNUNET_OS_start_process_s (sl->pipe_control
+                                          ? GNUNET_OS_INHERIT_STD_OUT_AND_ERR
+                                          | GNUNET_OS_USE_PIPE_CONTROL
+                                          : GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                           lsocks,
                                           loprefix,
                                           quotedbinary,
@@ -880,7 +882,11 @@ start_process (struct ServiceList *sl,
     if (GNUNET_YES == use_debug)
     {
       if (NULL == sl->config)
-        sl->proc = GNUNET_OS_start_process_s (sl->pipe_control,
+        sl->proc = GNUNET_OS_start_process_s (sl->pipe_control
+                                              ?
+                                              GNUNET_OS_INHERIT_STD_OUT_AND_ERR
+                                              | GNUNET_OS_USE_PIPE_CONTROL
+                                              :
                                               GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                               lsocks,
                                               loprefix,
@@ -890,7 +896,11 @@ start_process (struct ServiceList *sl,
                                               options,
                                               NULL);
       else
-        sl->proc = GNUNET_OS_start_process_s (sl->pipe_control,
+        sl->proc = GNUNET_OS_start_process_s (sl->pipe_control
+                                              ?
+                                              GNUNET_OS_INHERIT_STD_OUT_AND_ERR
+                                              | GNUNET_OS_USE_PIPE_CONTROL
+                                              :
                                               GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                               lsocks,
                                               loprefix,
@@ -905,7 +915,11 @@ start_process (struct ServiceList *sl,
     else
     {
       if (NULL == sl->config)
-        sl->proc = GNUNET_OS_start_process_s (sl->pipe_control,
+        sl->proc = GNUNET_OS_start_process_s (sl->pipe_control
+                                              ?
+                                              GNUNET_OS_INHERIT_STD_OUT_AND_ERR
+                                              | GNUNET_OS_USE_PIPE_CONTROL
+                                              :
                                               GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                               lsocks,
                                               loprefix,
@@ -913,7 +927,11 @@ start_process (struct ServiceList *sl,
                                               options,
                                               NULL);
       else
-        sl->proc = GNUNET_OS_start_process_s (sl->pipe_control,
+        sl->proc = GNUNET_OS_start_process_s (sl->pipe_control
+                                              ?
+                                              GNUNET_OS_INHERIT_STD_OUT_AND_ERR
+                                              | GNUNET_OS_USE_PIPE_CONTROL
+                                              :
                                               GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                               lsocks,
                                               loprefix,
@@ -1132,8 +1150,8 @@ free_service (struct ServiceList *sl)
   GNUNET_assert (GNUNET_YES == in_shutdown);
   GNUNET_CONTAINER_DLL_remove (running_head, running_tail, sl);
   GNUNET_assert (NULL == sl->listen_head);
-  GNUNET_free_non_null (sl->config);
-  GNUNET_free_non_null (sl->binary);
+  GNUNET_free (sl->config);
+  GNUNET_free (sl->binary);
   GNUNET_free (sl->name);
   GNUNET_free (sl);
 }
@@ -2152,7 +2170,7 @@ main (int argc, char *const *argv)
     GNUNET_MQ_handler_end ()
   };
 
-  sigpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, GNUNET_NO, GNUNET_NO);
+  sigpipe = GNUNET_DISK_pipe (GNUNET_DISK_PF_NONE);
   GNUNET_assert (NULL != sigpipe);
   shc_chld =
     GNUNET_SIGNAL_handler_install (GNUNET_SIGCHLD,
diff --git a/src/ats-tests/Makefile.am b/src/ats-tests/Makefile.am
index 1375d1505..cc30f660a 100644
--- a/src/ats-tests/Makefile.am
+++ b/src/ats-tests/Makefile.am
@@ -41,8 +41,10 @@ libgnunetatstesting_la_SOURCES = \
   ats-testing-experiment.c ats-testing-preferences.c
 libgnunetatstesting_la_LIBADD = \
   $(top_builddir)/src/testbed/libgnunettestbed.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/core/libgnunetcore.la \
   $(top_builddir)/src/transport/libgnunettransport.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/ats/libgnunetats.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
diff --git a/src/ats-tests/ats-testing-experiment.c b/src/ats-tests/ats-testing-experiment.c
index fa379200f..9f8db1be4 100644
--- a/src/ats-tests/ats-testing-experiment.c
+++ b/src/ats-tests/ats-testing-experiment.c
@@ -88,8 +88,8 @@ free_experiment (struct Experiment *e)
     GNUNET_free (cur);
   }
 
-  GNUNET_free_non_null (e->name);
-  GNUNET_free_non_null (e->cfg_file);
+  GNUNET_free (e->name);
+  GNUNET_free (e->cfg_file);
   GNUNET_free (e);
 }
 
@@ -332,7 +332,7 @@ load_episode (struct Experiment *e,
           GNUNET_free (type);
           GNUNET_free (op_name);
           GNUNET_free (op);
-          GNUNET_free_non_null (pref);
+          GNUNET_free (pref);
           GNUNET_free (o);
           GNUNET_free (sec_name);
           return GNUNET_SYSERR;
@@ -350,7 +350,7 @@ load_episode (struct Experiment *e,
           GNUNET_free (type);
           GNUNET_free (op_name);
           GNUNET_free (op);
-          GNUNET_free_non_null (pref);
+          GNUNET_free (pref);
           GNUNET_free (o);
           GNUNET_free (sec_name);
           return GNUNET_SYSERR;
@@ -384,7 +384,7 @@ load_episode (struct Experiment *e,
       fprintf (stderr, "Found operation %u in episode %u: %s [%llu]->[%llu]\n",
                op_counter, cur->id, print_op (o->type), o->src_id, o->dest_id);
 
-    GNUNET_free_non_null (type);
+    GNUNET_free (type);
     GNUNET_free (op);
 
     GNUNET_CONTAINER_DLL_insert (cur->head, cur->tail, o);
diff --git a/src/ats-tests/ats-testing.c b/src/ats-tests/ats-testing.c
index c7969cdfe..c6ba8533d 100644
--- a/src/ats-tests/ats-testing.c
+++ b/src/ats-tests/ats-testing.c
@@ -110,7 +110,7 @@ do_shutdown (void *cls)
       GNUNET_TESTBED_operation_done (p->comm_op);
       p->comm_op = NULL;
     }
-    GNUNET_free_non_null (p->core_connect_ops);
+    GNUNET_free (p->core_connect_ops);
     GNUNET_free (p->partners);
     p->partners = NULL;
   }
diff --git a/src/ats-tests/gnunet-ats-sim.c b/src/ats-tests/gnunet-ats-sim.c
index fb3014798..15cd52e2f 100644
--- a/src/ats-tests/gnunet-ats-sim.c
+++ b/src/ats-tests/gnunet-ats-sim.c
@@ -339,7 +339,7 @@ parse_args (int argc, char *argv[])
   {
     if ((c < (argc - 1)) && (0 == strcmp (argv[c], "-e")))
     {
-      GNUNET_free_non_null (opt_exp_file);
+      GNUNET_free (opt_exp_file);
       opt_exp_file = GNUNET_strdup (argv[c + 1]);
     }
     if (0 == strcmp (argv[c], "-l"))
diff --git a/src/ats-tests/gnunet-solver-eval.c b/src/ats-tests/gnunet-solver-eval.c
index 09ddd7b2d..7a3461bf7 100644
--- a/src/ats-tests/gnunet-solver-eval.c
+++ b/src/ats-tests/gnunet-solver-eval.c
@@ -94,8 +94,8 @@ free_experiment (struct Experiment *e)
     GNUNET_free (cur);
   }
 
-  GNUNET_free_non_null (e->name);
-  GNUNET_free_non_null (e->cfg_file);
+  GNUNET_free (e->name);
+  GNUNET_free (e->cfg_file);
   GNUNET_free (e);
 }
 
@@ -344,7 +344,7 @@ load_episode (struct Experiment *e,
           GNUNET_free (op_name);
           GNUNET_free (op);
           GNUNET_free (sec_name);
-          GNUNET_free_non_null (pref);
+          GNUNET_free (pref);
           GNUNET_free (o);
           return GNUNET_SYSERR;
         }
@@ -364,7 +364,7 @@ load_episode (struct Experiment *e,
           GNUNET_free (op_name);
           GNUNET_free (op);
           GNUNET_free (sec_name);
-          GNUNET_free_non_null (pref);
+          GNUNET_free (pref);
           GNUNET_free (o);
           return GNUNET_SYSERR;
         }
@@ -397,7 +397,7 @@ load_episode (struct Experiment *e,
       fprintf (stderr, "Found operation %u in episode %u: %s [%llu]->[%llu]\n",
                op_counter, cur->id, print_op (o->type), o->src_id, o->dest_id);
 
-    GNUNET_free_non_null (type);
+    GNUNET_free (type);
     GNUNET_free (op);
 
     GNUNET_CONTAINER_DLL_insert (cur->head, cur->tail, o);
diff --git a/src/ats-tool/gnunet-ats.c b/src/ats-tool/gnunet-ats.c
index 947ed7798..169daa6f1 100644
--- a/src/ats-tool/gnunet-ats.c
+++ b/src/ats-tool/gnunet-ats.c
@@ -978,8 +978,8 @@ main (int argc, char *const *argv)
                             options,
                             &run,
                             NULL);
-  GNUNET_free_non_null (opt_pid_str);
-  GNUNET_free_non_null (opt_type_str);
+  GNUNET_free (opt_pid_str);
+  GNUNET_free (opt_type_str);
   GNUNET_free_nz ((void *) argv);
 
   if (GNUNET_OK == res)
diff --git a/src/ats/ats.conf.in b/src/ats/ats.conf.in
index 53c0de0c5..7691f98c0 100644
--- a/src/ats/ats.conf.in
+++ b/src/ats/ats.conf.in
@@ -12,9 +12,11 @@ UNIX_MATCH_GID = YES
 # Designated assignment mode: PROPORTIONAL / MLP / RIL
 MODE = proportional
 
+# IMPORTANT: Do not lower those quotas below 10 MiB
+# Or your peer may not bootstrap correctly.
 # Network specific inbound/outbound quotas
-UNSPECIFIED_QUOTA_IN = 64 KiB
-UNSPECIFIED_QUOTA_OUT = 64 KiB
+UNSPECIFIED_QUOTA_IN = 10 MiB
+UNSPECIFIED_QUOTA_OUT = 10 MiB
 # LOOPBACK
 LOOPBACK_QUOTA_IN = unlimited
 LOOPBACK_QUOTA_OUT = unlimited
@@ -22,14 +24,14 @@ LOOPBACK_QUOTA_OUT = unlimited
 LAN_QUOTA_IN = unlimited
 LAN_QUOTA_OUT = unlimited
 # WAN
-WAN_QUOTA_IN = 64 KiB
-WAN_QUOTA_OUT = 64 KiB
+WAN_QUOTA_IN = 10 MiB
+WAN_QUOTA_OUT = 10 MiB
 # WLAN
-WLAN_QUOTA_IN = 1 MiB
-WLAN_QUOTA_OUT = 1 MiB
+WLAN_QUOTA_IN = 10 MiB
+WLAN_QUOTA_OUT = 10 MiB
 # BLUETOOTH
-BLUETOOTH_QUOTA_IN = 128 KiB
-BLUETOOTH_QUOTA_OUT = 128 KiB
+BLUETOOTH_QUOTA_IN = 10 MiB
+BLUETOOTH_QUOTA_OUT = 10 MiB
 # ATS options
 
 # Proportional specific settings
diff --git a/src/ats/gnunet-ats-solver-eval.c b/src/ats/gnunet-ats-solver-eval.c
index 6a014357e..25b963532 100644
--- a/src/ats/gnunet-ats-solver-eval.c
+++ b/src/ats/gnunet-ats-solver-eval.c
@@ -1307,17 +1307,17 @@ free_experiment (struct Experiment *e)
     for (cur_o = next_o; NULL != cur_o; cur_o = next_o)
     {
       next_o = cur_o->next;
-      GNUNET_free_non_null (cur_o->address);
-      GNUNET_free_non_null (cur_o->plugin);
+      GNUNET_free (cur_o->address);
+      GNUNET_free (cur_o->plugin);
       GNUNET_free (cur_o);
     }
     GNUNET_free (cur);
   }
 
-  GNUNET_free_non_null (e->name);
-  GNUNET_free_non_null (e->log_prefix);
-  GNUNET_free_non_null (e->log_output_dir);
-  GNUNET_free_non_null (e->cfg_file);
+  GNUNET_free (e->name);
+  GNUNET_free (e->log_prefix);
+  GNUNET_free (e->log_output_dir);
+  GNUNET_free (e->cfg_file);
   GNUNET_free (e);
 }
 
@@ -1967,7 +1967,7 @@ load_op_start_set_property (struct GNUNET_ATS_TEST_Operation *o,
     fprintf (stderr, "Missing property in operation %u `%s' in episode %u\n",
              op_counter, op_name, e->id);
     GNUNET_free (op_name);
-    GNUNET_free_non_null (prop);
+    GNUNET_free (prop);
     return GNUNET_SYSERR;
   }
 
@@ -2038,7 +2038,7 @@ load_op_stop_set_property (struct GNUNET_ATS_TEST_Operation *o,
     fprintf (stderr, "Missing property in operation %u `%s' in episode `%s'\n",
              op_counter, "STOP_SET_PROPERTY", op_name);
     GNUNET_free (op_name);
-    GNUNET_free_non_null (pref);
+    GNUNET_free (pref);
     return GNUNET_SYSERR;
   }
 
@@ -2047,7 +2047,7 @@ load_op_stop_set_property (struct GNUNET_ATS_TEST_Operation *o,
     fprintf (stderr, "Invalid property in operation %u `%s' in episode %u\n",
              op_counter, op_name, e->id);
     GNUNET_free (op_name);
-    GNUNET_free_non_null (pref);
+    GNUNET_free (pref);
     return GNUNET_SYSERR;
   }
 
@@ -2419,7 +2419,7 @@ enforce_del_address (struct GNUNET_ATS_TEST_Operation *op)
   }
   GNUNET_CONTAINER_DLL_remove (p->addr_head, p->addr_tail, a);
 
-  GNUNET_free_non_null (a->ats_addr->atsi);
+  GNUNET_free (a->ats_addr->atsi);
   GNUNET_free (a->ats_addr);
   GNUNET_free (a);
 }
diff --git a/src/ats/perf_ats_solver.c b/src/ats/perf_ats_solver.c
index 8e20f4454..2fbadef4d 100644
--- a/src/ats/perf_ats_solver.c
+++ b/src/ats/perf_ats_solver.c
@@ -325,8 +325,8 @@ end_now (int res)
     ph.stat = NULL;
   }
 
-  GNUNET_free_non_null (ph.peers);
-  GNUNET_free_non_null (ph.iterations_results);
+  GNUNET_free (ph.peers);
+  GNUNET_free (ph.iterations_results);
 
   GAS_normalization_stop ();
   GAS_preference_done ();
@@ -1090,13 +1090,13 @@ write_all_iterations (void)
   if ((NULL != f_full) && (GNUNET_SYSERR == GNUNET_DISK_file_close (f_full)))
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Cannot close log file `%s'\n",
                 data_fn_full);
-  GNUNET_free_non_null (data_fn_full);
+  GNUNET_free (data_fn_full);
 
   if ((NULL != f_update) && (GNUNET_SYSERR == GNUNET_DISK_file_close (
                                f_update)))
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Cannot close log file `%s'\n",
                 data_fn_update);
-  GNUNET_free_non_null (data_fn_update);
+  GNUNET_free (data_fn_update);
 }
 
 
@@ -1115,7 +1115,7 @@ do_delete_address (void *cls,
                                                        pid,
                                                        cur));
   ph.sf->s_del (ph.sf->cls, cur);
-  GNUNET_free_non_null (cur->atsi);
+  GNUNET_free (cur->atsi);
   GNUNET_free (cur);
   return GNUNET_OK;
 }
@@ -1427,7 +1427,7 @@ run (void *cls, char *const *args, const char *cfgfile,
       if (0 == c2)
         continue;
       if (ph.measure_updates)
-        GNUNET_free_non_null (
+        GNUNET_free (
           ph.iterations_results[c].update_results_array[c2]);
       GNUNET_free (ph.iterations_results[c].results_array[c2]);
     }
diff --git a/src/ats/plugin_ats_proportional.c b/src/ats/plugin_ats_proportional.c
index f4324d238..52476c825 100644
--- a/src/ats/plugin_ats_proportional.c
+++ b/src/ats/plugin_ats_proportional.c
@@ -218,6 +218,8 @@ is_bandwidth_available_in_network (struct Network *net,
   if (((net->total_quota_in / na) > min_bw) &&
       ((net->total_quota_out / na) > min_bw))
     return GNUNET_YES;
+  LOG (GNUNET_ERROR_TYPE_DEBUG,
+       "No bandwidth available in network\n");
   return GNUNET_NO;
 }
 
@@ -1225,7 +1227,7 @@ libgnunet_plugin_ats_proportional_done (void *cls)
       GNUNET_CONTAINER_DLL_remove (s->network_entries[c].head,
                                    s->network_entries[c].tail,
                                    cur);
-      GNUNET_free_non_null (cur->addr->solver_information);
+      GNUNET_free (cur->addr->solver_information);
       GNUNET_free (cur);
     }
     GNUNET_free (s->network_entries[c].stat_total);
diff --git a/src/ats/test_ats_api_proportional.conf b/src/ats/test_ats_api_proportional.conf
index 21f8218ee..ee8f8f8e7 100644
--- a/src/ats/test_ats_api_proportional.conf
+++ b/src/ats/test_ats_api_proportional.conf
@@ -17,8 +17,8 @@ LOOPBACK_QUOTA_OUT = unlimited
 LAN_QUOTA_IN = unlimited
 LAN_QUOTA_OUT = unlimited
 # WAN
-WAN_QUOTA_IN = 64 KiB
-WAN_QUOTA_OUT = 64 KiB
+WAN_QUOTA_IN = 5 MiB
+WAN_QUOTA_OUT = 5 MiB
 # WLAN
 WLAN_QUOTA_IN = 4096
 WLAN_QUOTA_OUT = 4096
diff --git a/src/ats/test_ats_lib.c b/src/ats/test_ats_lib.c
index 2c4d3f5ad..d19da0106 100644
--- a/src/ats/test_ats_lib.c
+++ b/src/ats/test_ats_lib.c
@@ -165,7 +165,7 @@ free_asd (void *cls,
                  GNUNET_CONTAINER_multipeermap_remove (p2asd,
                                                        key,
                                                        asd));
-  GNUNET_free_non_null (asd->address);
+  GNUNET_free (asd->address);
   GNUNET_free (asd);
   return GNUNET_OK;
 }
@@ -951,7 +951,7 @@ address_suggest_cb (void *cls,
   asd->bandwidth_out = bandwidth_out;
   asd->bandwidth_in = bandwidth_in;
   asd->session = session;
-  GNUNET_free_non_null (asd->address);
+  GNUNET_free (asd->address);
   asd->address = NULL;
   if (NULL != address)
     asd->address = GNUNET_HELLO_address_copy (address);
diff --git a/src/ats/test_ats_reservation_api.c b/src/ats/test_ats_reservation_api.c
index 46658007b..f6a964df4 100644
--- a/src/ats/test_ats_reservation_api.c
+++ b/src/ats/test_ats_reservation_api.c
@@ -102,14 +102,14 @@ static struct Command test_commands[] = {
 
 
   },
-  /* 6: reserve another 32k -- should now fail (if MAX_BANDWIDTH_CARRY_S
+  /* 6: reserve another 32M -- should now fail (if MAX_BANDWIDTH_CARRY_S
      is precisely observed) */
   {
     .code = CMD_RESERVE_BANDWIDTH,
     .label = "failing reservation",
     .details.reserve_bandwidth = {
       .pid = 0,
-      .amount = 32 * 1024,
+      .amount = 32 * 1024 * 1024,
       .expected_result = GNUNET_SYSERR
     }
 
diff --git a/src/block/Makefile.am b/src/block/Makefile.am
index dd596f6b4..ceeff4c66 100644
--- a/src/block/Makefile.am
+++ b/src/block/Makefile.am
@@ -23,41 +23,49 @@ libgnunet_plugin_block_template_la_SOURCES = \
   plugin_block_template.c
 libgnunet_plugin_block_template_la_LIBADD = \
   libgnunetblockgroup.la \
+  libgnunetblock.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(LTLIBINTL)
+libgnunet_plugin_block_template_la_DEPENDENCIES = \
+  libgnunetblockgroup.la \
+  libgnunetblock.la \
+  $(top_builddir)/src/util/libgnunetutil.la
 libgnunet_plugin_block_template_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
+  $(GN_PLUGIN_LDFLAGS)
 
 libgnunet_plugin_block_test_la_SOURCES = \
   plugin_block_test.c
 libgnunet_plugin_block_test_la_LIBADD = \
   libgnunetblockgroup.la \
-$(top_builddir)/src/util/libgnunetutil.la  \
+  libgnunetblock.la \
+  $(top_builddir)/src/util/libgnunetutil.la  \
   $(LTLIBINTL)
+libgnunet_plugin_block_test_la_DEPENDENCIES = \
+  libgnunetblockgroup.la \
+  libgnunetblock.la \
+  $(top_builddir)/src/util/libgnunetutil.la
 libgnunet_plugin_block_test_la_LDFLAGS = \
- $(GN_PLUGIN_LDFLAGS)
-
+  $(GN_PLUGIN_LDFLAGS)
 
 libgnunetblock_la_SOURCES = \
   block.c
 libgnunetblock_la_LIBADD = \
- $(top_builddir)/src/util/libgnunetutil.la
+  $(top_builddir)/src/util/libgnunetutil.la
 libgnunetblock_la_DEPENDENCIES = \
- $(top_builddir)/src/util/libgnunetutil.la
+  $(top_builddir)/src/util/libgnunetutil.la
 libgnunetblock_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
   $(GN_LIBINTL) \
   -version-info 0:0:0
 
-
 libgnunetblockgroup_la_SOURCES = \
   bg_bf.c
 libgnunetblockgroup_la_LIBADD = \
- libgnunetblock.la \
- $(top_builddir)/src/util/libgnunetutil.la
+  libgnunetblock.la \
+  $(top_builddir)/src/util/libgnunetutil.la
 libgnunetblockgroup_la_DEPENDENCIES = \
- libgnunetblock.la \
- $(top_builddir)/src/util/libgnunetutil.la
+  libgnunetblock.la \
+  $(top_builddir)/src/util/libgnunetutil.la
 libgnunetblockgroup_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS) \
   $(GN_LIBINTL) \
diff --git a/src/cadet/cadet.h b/src/cadet/cadet.h
index d17eab1d6..31dad4117 100644
--- a/src/cadet/cadet.h
+++ b/src/cadet/cadet.h
@@ -325,7 +325,7 @@ struct GNUNET_CADET_RequestDropCadetMessage
    * Type: #GNUNET_MESSAGE_TYPE_CADET_DROP_CADET_MESSAGE
    */
   struct GNUNET_MessageHeader header;
-  
+
   /**
    * Type of the message this handler covers, in host byte order.
    */
@@ -337,7 +337,7 @@ struct GNUNET_CADET_RequestDropCadetMessage
   struct GNUNET_CADET_ClientChannelNumber ccn;
 
 };
-  
+
 /**
  * Message to inform the client about channels in the service.
  */
diff --git a/src/cadet/cadet_api.c b/src/cadet/cadet_api.c
index 45cb66c1d..45cc508a6 100644
--- a/src/cadet/cadet_api.c
+++ b/src/cadet/cadet_api.c
@@ -819,7 +819,7 @@ GNUNET_CADET_close_port (struct GNUNET_CADET_Port *p)
     msg->port = p->id;
     GNUNET_MQ_send (p->cadet->mq, env);
   }
-  GNUNET_free_non_null (p->handlers);
+  GNUNET_free (p->handlers);
   GNUNET_free (p);
 }
 
@@ -1001,8 +1001,8 @@ GNUNET_CADET_open_port (struct GNUNET_CADET_Handle *h,
   p->window_changes = window_changes;
   p->disconnects = disconnects;
   p->handlers = (NULL == pd->agpl_url)
-    ? GNUNET_MQ_copy_handlers (handlers)
-    : GNUNET_MQ_copy_handlers2 (handlers, &return_agpl, NULL);
+                ? GNUNET_MQ_copy_handlers (handlers)
+                : GNUNET_MQ_copy_handlers2 (handlers, &return_agpl, NULL);
 
   GNUNET_assert (GNUNET_OK == open_port_cb (h, &p->id, p));
   return p;
diff --git a/src/cadet/cadet_api_drop_message.c b/src/cadet/cadet_api_drop_message.c
index d9f7e003e..2b031b5c0 100644
--- a/src/cadet/cadet_api_drop_message.c
+++ b/src/cadet/cadet_api_drop_message.c
@@ -11,7 +11,7 @@
      WITHOUT ANY WARRANTY; without even the implied warranty of
      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
      Affero General Public License for more details.
-    
+
      You should have received a copy of the GNU Affero General Public License
      along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
@@ -35,8 +35,8 @@
  */
 void
 GNUNET_CADET_drop_message (struct GNUNET_MQ_Handle *mq,
-                           struct GNUNET_CADET_ClientChannelNumber ccn,
-                           uint16_t type)
+                           struct GNUNET_CADET_ClientChannelNumber ccn,
+                           uint16_t type)
 {
   struct GNUNET_CADET_RequestDropCadetMessage *message;
   struct GNUNET_MQ_Envelope *env;
@@ -45,15 +45,15 @@ GNUNET_CADET_drop_message (struct GNUNET_MQ_Handle *mq,
 
   message->ccn = ccn;
   message->type = type;
-  
+
   GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-              "Dropping message for channel of type %s (%d)\n", type == GNUNET_MESSAGE_TYPE_CADET_CHANNEL_DESTROY ? "GNUNET_MESSAGE_TYPE_CADET_CHANNEL_DESTROY" : "UNKNOWN", type);
+              "Dropping message for channel of type %s (%d)\n", type ==
+              GNUNET_MESSAGE_TYPE_CADET_CHANNEL_DESTROY ?
+              "GNUNET_MESSAGE_TYPE_CADET_CHANNEL_DESTROY" : "UNKNOWN", type);
 
   GNUNET_MQ_send (mq, env);
-  
-}
-
 
+}
 
 
 /* end of cadet_api_drop_message.c */
diff --git a/src/cadet/cadet_protocol.h b/src/cadet/cadet_protocol.h
index 08298e224..117a7922e 100644
--- a/src/cadet/cadet_protocol.h
+++ b/src/cadet/cadet_protocol.h
@@ -85,11 +85,11 @@ struct GNUNET_CADET_ConnectionCreateMessage
   uint32_t options GNUNET_PACKED;
 
   /**
-   * This flag indicates the peer sending the connection create 
+   * This flag indicates the peer sending the connection create
    * meassage likes to trigger a KX handshake.
    */
   int has_monotime;
-  
+
   /**
    *  This monotonic time is set, if a peer likes to trigger a KX, but is not
    *  the peer that should start the KX. (xrs,t3ss)
diff --git a/src/cadet/gnunet-service-cadet.c b/src/cadet/gnunet-service-cadet.c
index 03af3d5c0..2d3b548dd 100644
--- a/src/cadet/gnunet-service-cadet.c
+++ b/src/cadet/gnunet-service-cadet.c
@@ -415,7 +415,7 @@ shutdown_rest ()
   }
   GCD_shutdown ();
   GCH_shutdown ();
-  GNUNET_free_non_null (my_private_key);
+  GNUNET_free (my_private_key);
   my_private_key = NULL;
 }
 
@@ -1010,6 +1010,7 @@ handle_info_tunnels (void *cls,
   GNUNET_SERVICE_client_continue (c->client);
 }
 
+
 /**
  * Handler for client's #GNUNET_MESSAGE_TYPE_CADET_DROP_CADET_MESSAGE request.
  *
@@ -1026,11 +1027,12 @@ handle_drop_message (void *cls,
   ch = lookup_channel (c,
                        message->ccn);
 
-  GCCH_assign_type_to_drop(ch, message);
-  
+  GCCH_assign_type_to_drop (ch, message);
+
   GNUNET_SERVICE_client_continue (c->client);
 }
 
+
 /**
  * Callback called when a client connects to the service.
  *
@@ -1327,52 +1329,52 @@ run (void *cls,
  * Define "main" method using service macro.
  */
 GNUNET_SERVICE_MAIN
-("cadet",
- GNUNET_SERVICE_OPTION_NONE,
- &run,
- &client_connect_cb,
- &client_disconnect_cb,
- NULL,
- GNUNET_MQ_hd_fixed_size (port_open,
-                          GNUNET_MESSAGE_TYPE_CADET_LOCAL_PORT_OPEN,
-                          struct GNUNET_CADET_PortMessage,
-                          NULL),
- GNUNET_MQ_hd_fixed_size (port_close,
-                          GNUNET_MESSAGE_TYPE_CADET_LOCAL_PORT_CLOSE,
-                          struct GNUNET_CADET_PortMessage,
-                          NULL),
- GNUNET_MQ_hd_fixed_size (channel_create,
-                          GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_CREATE,
-                          struct GNUNET_CADET_LocalChannelCreateMessage,
-                          NULL),
- GNUNET_MQ_hd_fixed_size (channel_destroy,
-                          GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_DESTROY,
-                          struct GNUNET_CADET_LocalChannelDestroyMessage,
-                          NULL),
- GNUNET_MQ_hd_var_size (local_data,
-                        GNUNET_MESSAGE_TYPE_CADET_LOCAL_DATA,
-                        struct GNUNET_CADET_LocalData,
-                        NULL),
- GNUNET_MQ_hd_fixed_size (local_ack,
-                          GNUNET_MESSAGE_TYPE_CADET_LOCAL_ACK,
-                          struct GNUNET_CADET_LocalAck,
-                          NULL),
- GNUNET_MQ_hd_fixed_size (get_peers,
-                          GNUNET_MESSAGE_TYPE_CADET_LOCAL_REQUEST_INFO_PEERS,
-                          struct GNUNET_MessageHeader,
-                          NULL),
- GNUNET_MQ_hd_fixed_size (show_path,
-                          GNUNET_MESSAGE_TYPE_CADET_LOCAL_REQUEST_INFO_PATH,
-                          struct GNUNET_CADET_RequestPathInfoMessage,
-                          NULL),
- GNUNET_MQ_hd_fixed_size (info_tunnels,
-                          GNUNET_MESSAGE_TYPE_CADET_LOCAL_REQUEST_INFO_TUNNELS,
-                          struct GNUNET_MessageHeader,
-                          NULL),
- GNUNET_MQ_hd_fixed_size (drop_message,
-                          GNUNET_MESSAGE_TYPE_CADET_DROP_CADET_MESSAGE,
-                          struct GNUNET_CADET_RequestDropCadetMessage,
-                          NULL),
- GNUNET_MQ_handler_end ());
+  ("cadet",
+  GNUNET_SERVICE_OPTION_NONE,
+  &run,
+  &client_connect_cb,
+  &client_disconnect_cb,
+  NULL,
+  GNUNET_MQ_hd_fixed_size (port_open,
+                           GNUNET_MESSAGE_TYPE_CADET_LOCAL_PORT_OPEN,
+                           struct GNUNET_CADET_PortMessage,
+                           NULL),
+  GNUNET_MQ_hd_fixed_size (port_close,
+                           GNUNET_MESSAGE_TYPE_CADET_LOCAL_PORT_CLOSE,
+                           struct GNUNET_CADET_PortMessage,
+                           NULL),
+  GNUNET_MQ_hd_fixed_size (channel_create,
+                           GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_CREATE,
+                           struct GNUNET_CADET_LocalChannelCreateMessage,
+                           NULL),
+  GNUNET_MQ_hd_fixed_size (channel_destroy,
+                           GNUNET_MESSAGE_TYPE_CADET_LOCAL_CHANNEL_DESTROY,
+                           struct GNUNET_CADET_LocalChannelDestroyMessage,
+                           NULL),
+  GNUNET_MQ_hd_var_size (local_data,
+                         GNUNET_MESSAGE_TYPE_CADET_LOCAL_DATA,
+                         struct GNUNET_CADET_LocalData,
+                         NULL),
+  GNUNET_MQ_hd_fixed_size (local_ack,
+                           GNUNET_MESSAGE_TYPE_CADET_LOCAL_ACK,
+                           struct GNUNET_CADET_LocalAck,
+                           NULL),
+  GNUNET_MQ_hd_fixed_size (get_peers,
+                           GNUNET_MESSAGE_TYPE_CADET_LOCAL_REQUEST_INFO_PEERS,
+                           struct GNUNET_MessageHeader,
+                           NULL),
+  GNUNET_MQ_hd_fixed_size (show_path,
+                           GNUNET_MESSAGE_TYPE_CADET_LOCAL_REQUEST_INFO_PATH,
+                           struct GNUNET_CADET_RequestPathInfoMessage,
+                           NULL),
+  GNUNET_MQ_hd_fixed_size (info_tunnels,
+                           GNUNET_MESSAGE_TYPE_CADET_LOCAL_REQUEST_INFO_TUNNELS,
+                           struct GNUNET_MessageHeader,
+                           NULL),
+  GNUNET_MQ_hd_fixed_size (drop_message,
+                           GNUNET_MESSAGE_TYPE_CADET_DROP_CADET_MESSAGE,
+                           struct GNUNET_CADET_RequestDropCadetMessage,
+                           NULL),
+  GNUNET_MQ_handler_end ());
 
 /* end of gnunet-service-cadet-new.c */
diff --git a/src/cadet/gnunet-service-cadet.h b/src/cadet/gnunet-service-cadet.h
index ff216f8c3..6da0950f1 100644
--- a/src/cadet/gnunet-service-cadet.h
+++ b/src/cadet/gnunet-service-cadet.h
@@ -325,5 +325,4 @@ const char *
 GSC_2s (struct CadetClient *c);
 
 
-
 #endif
diff --git a/src/cadet/gnunet-service-cadet_channel.c b/src/cadet/gnunet-service-cadet_channel.c
index e6fce562f..dab53b8c4 100644
--- a/src/cadet/gnunet-service-cadet_channel.c
+++ b/src/cadet/gnunet-service-cadet_channel.c
@@ -385,29 +385,32 @@ struct CadetChannel
    * Type of message to be droped. See GCT_send.
    */
   uint16_t type GNUNET_PACKED;
-  
+
 };
 
 /**
  * Assign type of message to drop.
- * @param ch CadetChannel to assign type to drop. 
+ * @param ch CadetChannel to assign type to drop.
  * @param message GNUNET_CADET_RequestDropCadetMessage to get the type from.
  */
 void
-GCCH_assign_type_to_drop(struct CadetChannel *ch, const struct GNUNET_CADET_RequestDropCadetMessage *message)
+GCCH_assign_type_to_drop (struct CadetChannel *ch, const struct
+                          GNUNET_CADET_RequestDropCadetMessage *message)
 {
 
   ch->type = message->type;
-  
+
 }
 
+
 /**
  * Check if type of message is the one to drop.
- * @param ch CadetChannel to check for message type to drop. 
+ * @param ch CadetChannel to check for message type to drop.
  * @param message GNUNET_MessageHeader to compare the type with.
  */
 int
-GCCH_is_type_to_drop(struct CadetChannel *ch, const struct GNUNET_MessageHeader *message)
+GCCH_is_type_to_drop (struct CadetChannel *ch, const struct
+                      GNUNET_MessageHeader *message)
 {
 
   if (ch->type == message->type)
@@ -419,6 +422,7 @@ GCCH_is_type_to_drop(struct CadetChannel *ch, const struct GNUNET_MessageHeader
     return GNUNET_NO;
 }
 
+
 /**
  * Get the static string for identification of the channel.
  *
@@ -854,7 +858,8 @@ send_channel_data_ack (struct CadetChannel *ch)
        GCCH_2s (ch));
   if (NULL != ch->last_control_qe)
     GCT_send_cancel (ch->last_control_qe);
-  ch->last_control_qe = GCT_send (ch->t, &msg.header, &send_ack_cb, ch, &msg.ctn);
+  ch->last_control_qe = GCT_send (ch->t, &msg.header, &send_ack_cb, ch,
+                                  &msg.ctn);
 }
 
 
@@ -881,7 +886,8 @@ send_open_ack (void *cls)
   msg.port = ch->port;
   if (NULL != ch->last_control_qe)
     GCT_send_cancel (ch->last_control_qe);
-  ch->last_control_qe = GCT_send (ch->t, &msg.header, &send_ack_cb, ch, &msg.ctn);
+  ch->last_control_qe = GCT_send (ch->t, &msg.header, &send_ack_cb, ch,
+                                  &msg.ctn);
 }
 
 
@@ -1513,7 +1519,8 @@ retry_transmission (void *cls)
        "Retrying transmission on %s of message %u\n",
        GCCH_2s (ch),
        (unsigned int) ntohl (crm->data_message->mid.mid));
-  crm->qe = GCT_send (ch->t, &crm->data_message->header, &data_sent_cb, crm, &crm->data_message->ctn);
+  crm->qe = GCT_send (ch->t, &crm->data_message->header, &data_sent_cb, crm,
+                      &crm->data_message->ctn);
   GNUNET_assert (NULL == ch->retry_data_task);
 }
 
@@ -1901,7 +1908,8 @@ GCCH_handle_local_data (struct CadetChannel *ch,
     GNUNET_SCHEDULER_cancel (ch->retry_data_task);
     ch->retry_data_task = NULL;
   }
-  crm->qe = GCT_send (ch->t, &crm->data_message->header, &data_sent_cb, crm, &crm->data_message->ctn);
+  crm->qe = GCT_send (ch->t, &crm->data_message->header, &data_sent_cb, crm,
+                      &crm->data_message->ctn);
   GNUNET_assert (NULL == ch->retry_data_task);
   return GNUNET_OK;
 }
diff --git a/src/cadet/gnunet-service-cadet_connection.c b/src/cadet/gnunet-service-cadet_connection.c
index a7c1d9fb0..3e1f779ad 100644
--- a/src/cadet/gnunet-service-cadet_connection.c
+++ b/src/cadet/gnunet-service-cadet_connection.c
@@ -614,6 +614,7 @@ set_monotime_sig (struct GNUNET_CADET_ConnectionCreateMessage *msg)
 
 }
 
+
 /**
  * Send a #GNUNET_MESSAGE_TYPE_CADET_CONNECTION_CREATE message to the
  * first hop.
@@ -641,7 +642,7 @@ send_create (void *cls)
 
   // check for tunnel state and set signed monotime (xrs,t3ss)
   t = GCP_get_tunnel (cc->destination, GNUNET_YES);
-  if ((NULL != t)&& (GCT_get_estate (t) == CADET_TUNNEL_KEY_UNINITIALIZED) &&
+  if ((NULL != t) && (GCT_get_estate (t) == CADET_TUNNEL_KEY_UNINITIALIZED) &&
       (GCT_alice_or_betty (GCP_get_id (cc->destination)) == GNUNET_NO))
   {
     create_msg->has_monotime = GNUNET_YES;
diff --git a/src/cadet/gnunet-service-cadet_core.c b/src/cadet/gnunet-service-cadet_core.c
index 04847f906..9a83fa31d 100644
--- a/src/cadet/gnunet-service-cadet_core.c
+++ b/src/cadet/gnunet-service-cadet_core.c
@@ -822,13 +822,13 @@ handle_connection_create (
          GCP_2s (origin),
          GNUNET_sh2s (&msg->cid.connection_of_tunnel));
     path = GCPP_get_path_from_route (path_length - 1, pids);
-    t = GCP_get_tunnel (sender, GNUNET_YES);
+    t = GCP_get_tunnel (origin, GNUNET_YES);
 
     // Check for CADET state in case the other side has lost the tunnel (xrs,t3ss)
     if ((GNUNET_YES == msg->has_monotime) &&
-        (GNUNET_YES == GCP_check_and_update_monotime(origin, msg->monotime)) &&
-        ( GNUNET_OK == GCP_check_monotime_sig(origin, msg)) &&
-         (CADET_TUNNEL_KEY_OK == GCT_get_estate(t)))
+        (GNUNET_YES == GCP_check_and_update_monotime (origin, msg->monotime)) &&
+        (GNUNET_OK == GCP_check_monotime_sig (origin, msg)) &&
+        (CADET_TUNNEL_KEY_OK == GCT_get_estate (t)))
     {
       GCT_change_estate (t, CADET_TUNNEL_KEY_UNINITIALIZED);
     }
diff --git a/src/cadet/gnunet-service-cadet_hello.c b/src/cadet/gnunet-service-cadet_hello.c
index 21870a454..c7857032b 100644
--- a/src/cadet/gnunet-service-cadet_hello.c
+++ b/src/cadet/gnunet-service-cadet_hello.c
@@ -75,7 +75,7 @@ got_hello (void *cls,
   if (0 == GNUNET_memcmp (id,
                           &my_full_id))
   {
-    GNUNET_free_non_null (mine);
+    GNUNET_free (mine);
     mine = (struct GNUNET_HELLO_Message *) GNUNET_copy_message (&hello->header);
     GCD_hello_update ();
     return;
diff --git a/src/cadet/gnunet-service-cadet_peer.c b/src/cadet/gnunet-service-cadet_peer.c
index 55800b88c..a2068b31b 100644
--- a/src/cadet/gnunet-service-cadet_peer.c
+++ b/src/cadet/gnunet-service-cadet_peer.c
@@ -345,8 +345,8 @@ destroy_peer (void *cls)
                  GNUNET_CONTAINER_multipeermap_remove (peers,
                                                        &cp->pid,
                                                        cp));
-  GNUNET_free_non_null (cp->path_heads);
-  GNUNET_free_non_null (cp->path_tails);
+  GNUNET_free (cp->path_heads);
+  GNUNET_free (cp->path_tails);
   cp->path_dll_length = 0;
   if (NULL != cp->search_h)
   {
@@ -376,7 +376,7 @@ destroy_peer (void *cls)
     GNUNET_SCHEDULER_cancel (cp->heap_cleanup_task);
     cp->heap_cleanup_task = NULL;
   }
-  GNUNET_free_non_null (cp->hello);
+  GNUNET_free (cp->hello);
   /* Peer should not be freed if paths exist; if there are no paths,
      there ought to be no connections, and without connections, no
      notifications. Thus we can assert that mqm_head is empty at this
@@ -1552,6 +1552,7 @@ GCP_send_ooo (struct CadetPeer *cp,
                   env);
 }
 
+
 /**
  * Checking if a monotime value is newer than the last monotime value received from a peer. If the time value is newer it will be stored at the peer.
  *
@@ -1574,6 +1575,7 @@ GCP_check_and_update_monotime (struct CadetPeer *peer,
   return GNUNET_NO;
 }
 
+
 /**
  * Checking the signature for a monotime of a GNUNET_CADET_ConnectionCreateMessage.
  *
diff --git a/src/cadet/gnunet-service-cadet_tunnels.c b/src/cadet/gnunet-service-cadet_tunnels.c
index 66e7d5b1e..2ca46b5aa 100644
--- a/src/cadet/gnunet-service-cadet_tunnels.c
+++ b/src/cadet/gnunet-service-cadet_tunnels.c
@@ -3476,7 +3476,7 @@ GCT_send (struct CadetTunnel *t,
   {
     ch = lookup_channel (t,
                          *ctn);
-    if ((NULL != ch)&& GCCH_is_type_to_drop (ch, message))
+    if ((NULL != ch) && GCCH_is_type_to_drop (ch, message))
     {
       GNUNET_break (0);
       return NULL;
diff --git a/src/cadet/gnunet-service-cadet_tunnels.h b/src/cadet/gnunet-service-cadet_tunnels.h
index 147f2e56f..075cd03f8 100644
--- a/src/cadet/gnunet-service-cadet_tunnels.h
+++ b/src/cadet/gnunet-service-cadet_tunnels.h
@@ -235,7 +235,7 @@ GCT_send (struct CadetTunnel *t,
           const struct GNUNET_MessageHeader *message,
           GCT_SendContinuation cont,
           void *cont_cls,
-          struct GNUNET_CADET_ChannelTunnelNumber *ctn);
+          struct GNUNET_CADET_ChannelTunnelNumber *ctn);
 
 
 /**
diff --git a/src/cadet/test_cadet.c b/src/cadet/test_cadet.c
index 779d3bc9f..23f2ccbe3 100644
--- a/src/cadet/test_cadet.c
+++ b/src/cadet/test_cadet.c
@@ -550,6 +550,7 @@ get_from_p_ids ()
   }
 }
 
+
 static struct GNUNET_CADET_Handle *
 get_from_cadets ()
 {
@@ -568,6 +569,7 @@ get_from_cadets ()
 
 }
 
+
 static unsigned int
 get_peer_nr (int outgoing)
 {
@@ -581,6 +583,7 @@ get_peer_nr (int outgoing)
   }
 }
 
+
 /**
  * Task to reconnect to other peer.
  *
@@ -626,6 +629,7 @@ reconnect_op (void *cls)
   send_test_message (outgoing_ch);
 }
 
+
 void
 reopen_channel ()
 {
@@ -659,6 +663,7 @@ reopen_channel ()
   send_test_message (outgoing_ch);
 }
 
+
 static void
 peers_callback (void *cls, const struct GNUNET_CADET_PeerListEntry *ple);
 
@@ -676,6 +681,7 @@ get_peers (void *cls)
 
 }
 
+
 /**
  * Method called to retrieve information about all peers in CADET, called
  * once per peer.
@@ -712,7 +718,7 @@ peers_callback (void *cls, const struct GNUNET_CADET_PeerListEntry *ple)
               "p_id %s\n",
               GNUNET_i2s_full (p_id));
 
-  if ((0 == GNUNET_memcmp (&ple->peer, p_id))&& ple->have_tunnel)
+  if ((0 == GNUNET_memcmp (&ple->peer, p_id)) && ple->have_tunnel)
   {
 
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@@ -733,6 +739,7 @@ peers_callback (void *cls, const struct GNUNET_CADET_PeerListEntry *ple)
   }
 }
 
+
 /**
  * Function called whenever an MQ-channel is destroyed, unless the destruction
  * was requested by #GNUNET_CADET_channel_destroy.
@@ -1169,7 +1176,7 @@ connect_handler (void *cls,
 
   if (peer == get_peer_nr (GNUNET_NO))
   {
-    if ((DESTROY != test)&&(NULL != incoming_ch))
+    if ((DESTROY != test) && (NULL != incoming_ch))
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Duplicate incoming channel for client %lu\n",
diff --git a/src/cadet/test_cadet.conf b/src/cadet/test_cadet.conf
index 067dd5fb4..79c86bb59 100644
--- a/src/cadet/test_cadet.conf
+++ b/src/cadet/test_cadet.conf
@@ -66,7 +66,7 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test-cadet/
 NO_IO = YES
 
 [nse]
-WORKBITS = 0
+WORKBITS = 2
 
 [hostlist]
 IMMEDIATE_START = NO
diff --git a/src/consensus/gnunet-service-consensus.c b/src/consensus/gnunet-service-consensus.c
index 160d352d7..13fa0d0e7 100644
--- a/src/consensus/gnunet-service-consensus.c
+++ b/src/consensus/gnunet-service-consensus.c
@@ -1347,7 +1347,7 @@ not_evil:
   evil->type = EVILNESS_NONE;
 cleanup:
   GNUNET_free (evil_spec);
-  /* no GNUNET_free_non_null since it wasn't
+  /* no GNUNET_free since it wasn't
    * allocated with GNUNET_malloc */
   if (NULL != evil_type_str)
     free (evil_type_str);
diff --git a/src/conversation/gnunet-conversation.c b/src/conversation/gnunet-conversation.c
index b908cd82c..7a2a727a5 100644
--- a/src/conversation/gnunet-conversation.c
+++ b/src/conversation/gnunet-conversation.c
@@ -359,7 +359,7 @@ start_phone ()
   else
   {
     GNUNET_CONVERSATION_phone_get_record (phone, &rd);
-    GNUNET_free_non_null (address);
+    GNUNET_free (address);
     address =
       GNUNET_GNSRECORD_value_to_string (rd.record_type, rd.data, rd.data_size);
     fprintf (
@@ -1035,7 +1035,7 @@ do_stop_task (void *cls)
   mic = NULL;
   GNUNET_free (ego_name);
   ego_name = NULL;
-  GNUNET_free_non_null (peer_name);
+  GNUNET_free (peer_name);
   peer_name = NULL;
   phone_state = PS_ERROR;
 }
diff --git a/src/conversation/test_conversation_api.c b/src/conversation/test_conversation_api.c
index dbb742d91..b51186dc8 100644
--- a/src/conversation/test_conversation_api.c
+++ b/src/conversation/test_conversation_api.c
@@ -402,7 +402,8 @@ namestore_put_cont (void *cls, int32_t success, const char *emsg)
   GNUNET_assert (GNUNET_YES == success);
   GNUNET_assert (NULL == emsg);
   GNUNET_assert (NULL == op);
-  op = GNUNET_IDENTITY_create (id, "caller-ego", NULL, &caller_ego_create_cont, NULL);
+  op = GNUNET_IDENTITY_create (id, "caller-ego", NULL, &caller_ego_create_cont,
+                               NULL);
 }
 
 
@@ -483,7 +484,8 @@ run (void *cls,
   cfg = c;
   GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_test, NULL);
   id = GNUNET_IDENTITY_connect (cfg, &identity_cb, NULL);
-  op = GNUNET_IDENTITY_create (id, "phone-ego", NULL, &phone_ego_create_cont, NULL);
+  op = GNUNET_IDENTITY_create (id, "phone-ego", NULL, &phone_ego_create_cont,
+                               NULL);
   ns = GNUNET_NAMESTORE_connect (cfg);
 }
 
diff --git a/src/conversation/test_conversation_api_reject.c b/src/conversation/test_conversation_api_reject.c
index 855b21fd7..69fa9f1dc 100644
--- a/src/conversation/test_conversation_api_reject.c
+++ b/src/conversation/test_conversation_api_reject.c
@@ -255,7 +255,8 @@ namestore_put_cont (void *cls, int32_t success, const char *emsg)
   GNUNET_assert (GNUNET_YES == success);
   GNUNET_assert (NULL == emsg);
   GNUNET_assert (NULL == op);
-  op = GNUNET_IDENTITY_create (id, "caller-ego", NULL, &caller_ego_create_cont, NULL);
+  op = GNUNET_IDENTITY_create (id, "caller-ego", NULL, &caller_ego_create_cont,
+                               NULL);
 }
 
 
@@ -336,7 +337,8 @@ run (void *cls,
   cfg = c;
   GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_test, NULL);
   id = GNUNET_IDENTITY_connect (cfg, &identity_cb, NULL);
-  op = GNUNET_IDENTITY_create (id, "phone-ego", NULL, &phone_ego_create_cont, NULL);
+  op = GNUNET_IDENTITY_create (id, "phone-ego", NULL, &phone_ego_create_cont,
+                               NULL);
   ns = GNUNET_NAMESTORE_connect (cfg);
 }
 
diff --git a/src/conversation/test_conversation_api_twocalls.c b/src/conversation/test_conversation_api_twocalls.c
index 6d434a3e1..83e8cb55a 100644
--- a/src/conversation/test_conversation_api_twocalls.c
+++ b/src/conversation/test_conversation_api_twocalls.c
@@ -524,7 +524,8 @@ namestore_put_cont (void *cls, int32_t success, const char *emsg)
   GNUNET_assert (GNUNET_YES == success);
   GNUNET_assert (NULL == emsg);
   GNUNET_assert (NULL == op);
-  op = GNUNET_IDENTITY_create (id, "caller-ego", NULL, &caller_ego_create_cont, NULL);
+  op = GNUNET_IDENTITY_create (id, "caller-ego", NULL, &caller_ego_create_cont,
+                               NULL);
 }
 
 
@@ -613,7 +614,8 @@ run (void *cls,
   timeout_task = GNUNET_SCHEDULER_add_delayed (TIMEOUT, &end_test, NULL);
   GNUNET_SCHEDULER_add_shutdown (&do_shutdown, NULL);
   id = GNUNET_IDENTITY_connect (cfg, &identity_cb, NULL);
-  op = GNUNET_IDENTITY_create (id, "phone-ego", NULL, &phone_ego_create_cont, NULL);
+  op = GNUNET_IDENTITY_create (id, "phone-ego", NULL, &phone_ego_create_cont,
+                               NULL);
   ns = GNUNET_NAMESTORE_connect (cfg);
 }
 
diff --git a/src/core/core_api.c b/src/core/core_api.c
index d24378654..81118693d 100644
--- a/src/core/core_api.c
+++ b/src/core/core_api.c
@@ -745,7 +745,7 @@ GNUNET_CORE_disconnect (struct GNUNET_CORE_Handle *handle)
     GNUNET_MQ_destroy (handle->mq);
     handle->mq = NULL;
   }
-  GNUNET_free_non_null (handle->handlers);
+  GNUNET_free (handle->handlers);
   GNUNET_free (handle);
 }
 
diff --git a/src/core/test_core_api.c b/src/core/test_core_api.c
index dda60215d..064964292 100644
--- a/src/core/test_core_api.c
+++ b/src/core/test_core_api.c
@@ -251,8 +251,8 @@ setup_peer (struct PeerContext *p, const char *cfgname)
 
   binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm");
   p->cfg = GNUNET_CONFIGURATION_create ();
-  p->arm_proc = GNUNET_OS_start_process (GNUNET_YES,
-                                         GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+  p->arm_proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR
+                                         | GNUNET_OS_USE_PIPE_CONTROL,
                                          NULL,
                                          NULL,
                                          NULL,
diff --git a/src/core/test_core_api_reliability.c b/src/core/test_core_api_reliability.c
index b510e8993..debf808ca 100644
--- a/src/core/test_core_api_reliability.c
+++ b/src/core/test_core_api_reliability.c
@@ -384,7 +384,7 @@ process_hello (void *cls,
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Received (my) `%s' from transport service\n", "HELLO");
   GNUNET_assert (message != NULL);
-  GNUNET_free_non_null (p->hello);
+  GNUNET_free (p->hello);
   p->hello = GNUNET_copy_message (message);
   if ((p == &p1) && (NULL == p2.oh))
     p2.oh = GNUNET_TRANSPORT_offer_hello (p2.cfg,
@@ -419,8 +419,8 @@ setup_peer (struct PeerContext *p,
   binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm");
   p->cfg = GNUNET_CONFIGURATION_create ();
   p->arm_proc
-    = GNUNET_OS_start_process (GNUNET_YES,
-                               GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+    = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR
+                               | GNUNET_OS_USE_PIPE_CONTROL,
                                NULL, NULL, NULL,
                                binary,
                                "gnunet-service-arm",
@@ -523,8 +523,8 @@ main (int argc,
                       &ok);
   stop_arm (&p1);
   stop_arm (&p2);
-  GNUNET_free_non_null (p1.hello);
-  GNUNET_free_non_null (p2.hello);
+  GNUNET_free (p1.hello);
+  GNUNET_free (p2.hello);
   GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-1");
   GNUNET_DISK_directory_remove ("/tmp/test-gnunet-core-peer-2");
 
diff --git a/src/core/test_core_api_start_only.c b/src/core/test_core_api_start_only.c
index 3cbe50d72..007131134 100644
--- a/src/core/test_core_api_start_only.c
+++ b/src/core/test_core_api_start_only.c
@@ -118,8 +118,8 @@ setup_peer (struct PeerContext *p,
   binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm");
   p->cfg = GNUNET_CONFIGURATION_create ();
   p->arm_proc =
-    GNUNET_OS_start_process (GNUNET_YES,
-                             GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+    GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR
+                             | GNUNET_OS_USE_PIPE_CONTROL,
                              NULL, NULL, NULL,
                              binary,
                              "gnunet-service-arm",
diff --git a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf b/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
index fa2d64474..766a2e73b 100644
--- a/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
+++ b/src/core/test_core_quota_asymmetric_recv_limited_peer1.conf
@@ -32,20 +32,20 @@ PORT = 12489
 PORT = 12491
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p1-service-ats.sock
 # UNSPECIFIED
-UNSPECIFIED_QUOTA_IN =  1 MB
-UNSPECIFIED_QUOTA_OUT =  1 MB
+UNSPECIFIED_QUOTA_IN =  100 MiB
+UNSPECIFIED_QUOTA_OUT =  100 MiB
 # LOOPBACK
-LOOPBACK_QUOTA_IN =  1 MB
-LOOPBACK_QUOTA_OUT =  1 MB
+LOOPBACK_QUOTA_IN =  100 MiB
+LOOPBACK_QUOTA_OUT =  100 MiB
 # LAN
-LAN_QUOTA_IN =  1 MB
-LAN_QUOTA_OUT =  1 MB
+LAN_QUOTA_IN =  100 MiB
+LAN_QUOTA_OUT =  100 MiB
 # WAN
-WAN_QUOTA_IN = 1 MB
-WAN_QUOTA_OUT = 1 MB
+WAN_QUOTA_IN = 100 MiB
+WAN_QUOTA_OUT = 100 MiB
 # WLAN
-WLAN_QUOTA_IN =  1 MB
-WLAN_QUOTA_OUT =  1 MB
+WLAN_QUOTA_IN =  100 MiB
+WLAN_QUOTA_OUT =  100 MiB
 
 
 [core]
diff --git a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf b/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
index b2a84f706..30c0bb81f 100644
--- a/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
+++ b/src/core/test_core_quota_asymmetric_recv_limited_peer2.conf
@@ -31,20 +31,20 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p2-service-core.sock
 PORT = 22491
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-recv-p2-service-ats.sock
 # UNSPECIFIED
-UNSPECIFIED_QUOTA_IN = 10240
-UNSPECIFIED_QUOTA_OUT = 10240
+UNSPECIFIED_QUOTA_IN = 10 MiB
+UNSPECIFIED_QUOTA_OUT = 10 MiB
 # LOOPBACK
-LOOPBACK_QUOTA_IN = 10240
-LOOPBACK_QUOTA_OUT = 10240
+LOOPBACK_QUOTA_IN = 10 MiB
+LOOPBACK_QUOTA_OUT = 10 MiB
 # LAN
-LAN_QUOTA_IN = 10240
-LAN_QUOTA_OUT = 10240
+LAN_QUOTA_IN = 10 MiB
+LAN_QUOTA_OUT = 10 MiB
 # WAN
-WAN_QUOTA_IN = 10240
-WAN_QUOTA_OUT = 10240
+WAN_QUOTA_IN = 10 MiB
+WAN_QUOTA_OUT = 10 MiB
 # WLAN
-WLAN_QUOTA_IN = 10240
-WLAN_QUOTA_OUT = 10240
+WLAN_QUOTA_IN = 10 MiB
+WLAN_QUOTA_OUT = 10 MiB
 
 [transport-tcp]
 PORT = 22467
diff --git a/src/core/test_core_quota_asymmetric_send_limit_peer1.conf b/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
index 6b416f580..4a9f483d6 100644
--- a/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
+++ b/src/core/test_core_quota_asymmetric_send_limit_peer1.conf
@@ -32,20 +32,20 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p1-service-transport.sock
 PORT = 12491
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p1-service-ats.sock
 # UNSPECIFIED
-UNSPECIFIED_QUOTA_IN = 10240
-UNSPECIFIED_QUOTA_OUT = 10240
+UNSPECIFIED_QUOTA_IN = 10 MiB
+UNSPECIFIED_QUOTA_OUT = 10 MiB
 # LOOPBACK
-LOOPBACK_QUOTA_IN = 10240
-LOOPBACK_QUOTA_OUT = 10240
+LOOPBACK_QUOTA_IN = 10 MiB
+LOOPBACK_QUOTA_OUT = 10 MiB
 # LAN
-LAN_QUOTA_IN = 10240
-LAN_QUOTA_OUT = 10240
+LAN_QUOTA_IN = 10 MiB
+LAN_QUOTA_OUT = 10 MiB
 # WAN
-WAN_QUOTA_IN = 10240
-WAN_QUOTA_OUT = 10240
+WAN_QUOTA_IN = 10 MiB
+WAN_QUOTA_OUT = 10 MiB
 # WLAN
-WLAN_QUOTA_IN = 10240
-WLAN_QUOTA_OUT = 10240
+WLAN_QUOTA_IN = 10 MiB
+WLAN_QUOTA_OUT = 10 MiB
 
 [core]
 PORT = 12490
diff --git a/src/core/test_core_quota_asymmetric_send_limit_peer2.conf b/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
index 05ea062e6..36434461c 100644
--- a/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
+++ b/src/core/test_core_quota_asymmetric_send_limit_peer2.conf
@@ -29,27 +29,27 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p2-service-core.sock
 [ats]
 PORT = 22491
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-asym-send-p2-service-ats.sock
-WAN_QUOTA_IN = 1 MB
-WAN_QUOTA_OUT = 1 MB
+WAN_QUOTA_IN = 100 MiB
+WAN_QUOTA_OUT = 100 MiB
 
 [ats]
 PORT = 12471
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-ats.sock
 # UNSPECIFIED
-UNSPECIFIED_QUOTA_IN =  1 MB
-UNSPECIFIED_QUOTA_OUT =  1 MB
+UNSPECIFIED_QUOTA_IN =  100 MiB
+UNSPECIFIED_QUOTA_OUT =  100 MiB
 # LOOPBACK
-LOOPBACK_QUOTA_IN =  1 MB
-LOOPBACK_QUOTA_OUT =  1 MB
+LOOPBACK_QUOTA_IN =  100 MiB
+LOOPBACK_QUOTA_OUT =  100 MiB
 # LAN
-LAN_QUOTA_IN =  1 MB
-LAN_QUOTA_OUT =  1 MB
+LAN_QUOTA_IN =  100 MiB
+LAN_QUOTA_OUT =  100 MiB
 # WAN
-WAN_QUOTA_IN = 1 MB
-WAN_QUOTA_OUT = 1 MB
+WAN_QUOTA_IN = 100 MiB
+WAN_QUOTA_OUT = 100 MiB
 # WLAN
-WLAN_QUOTA_IN =  1 MB
-WLAN_QUOTA_OUT =  1 MB
+WLAN_QUOTA_IN =  100 MiB
+WLAN_QUOTA_OUT =  100 MiB
 
 [transport-tcp]
 PORT = 22467
diff --git a/src/core/test_core_quota_compliance.c b/src/core/test_core_quota_compliance.c
index 67f8bb224..cf2da3d97 100644
--- a/src/core/test_core_quota_compliance.c
+++ b/src/core/test_core_quota_compliance.c
@@ -570,8 +570,8 @@ setup_peer (struct PeerContext *p,
   binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm");
   p->cfg = GNUNET_CONFIGURATION_create ();
   p->arm_proc =
-    GNUNET_OS_start_process (GNUNET_YES,
-                             GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+    GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR
+                             | GNUNET_OS_USE_PIPE_CONTROL,
                              NULL, NULL, NULL,
                              binary,
                              "gnunet-service-arm",
diff --git a/src/core/test_core_quota_peer1.conf b/src/core/test_core_quota_peer1.conf
index ea4fa273c..ec592f778 100644
--- a/src/core/test_core_quota_peer1.conf
+++ b/src/core/test_core_quota_peer1.conf
@@ -1,61 +1,58 @@
 @INLINE@ test_core_defaults.conf
 [PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-core-quota-sym-peer-1/
-
-[transport-tcp]
-PORT = 12468
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-core-peer-1/
 
 [arm]
-PORT = 12476
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-arm.sock
+PORT = 12460
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-arm.sock
 
 [statistics]
-PORT = 12477
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-statistics.sock
+PORT = 12461
 
 [resolver]
-PORT = 12474
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-resolver.sock
+PORT = 12462
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-resolver.sock
 
 [peerinfo]
-PORT = 12479
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-peerinfo.sock
+PORT = 12463
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-peerinfo.sock
 
 [transport]
-PORT = 12475
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-transport.sock
+PORT = 12464
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-transport.sock
 
-[nat]
-port = 12481
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-nat.sock
+[core]
+PORT = 12475
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-core.sock
 
 [ats]
-PORT = 12471
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-ats.sock
+PORT = 12476
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p1-service-ats.sock
 # UNSPECIFIED
-UNSPECIFIED_QUOTA_IN = 10240
-UNSPECIFIED_QUOTA_OUT = 10240
+UNSPECIFIED_QUOTA_IN = 10 MiB
+UNSPECIFIED_QUOTA_OUT = 10 MiB
 # LOOPBACK
-LOOPBACK_QUOTA_IN = 10240
-LOOPBACK_QUOTA_OUT = 10240
+LOOPBACK_QUOTA_IN = 10 MiB
+LOOPBACK_QUOTA_OUT = 10 MiB
 # LAN
-LAN_QUOTA_IN = 10240
-LAN_QUOTA_OUT = 10240
+LAN_QUOTA_IN = 10 MiB
+LAN_QUOTA_OUT = 10 MiB
 # WAN
-WAN_QUOTA_IN = 10240
-WAN_QUOTA_OUT = 10240
+WAN_QUOTA_IN = 10 MiB
+WAN_QUOTA_OUT = 10 MiB
 # WLAN
-WLAN_QUOTA_IN = 10240
-WLAN_QUOTA_OUT = 10240
+WLAN_QUOTA_IN = 10 MiB
+WLAN_QUOTA_OUT = 10 MiB
 
-[core]
-PORT = 12480
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-core.sock
 
-[ats]
-PORT = 12481
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p1-service-ats.sock
+[transport-tcp]
+PORT = 12467
 
 [transport-udp]
-PORT = 12482
+PORT = 12468
+
+[transport-unix]
+PORT = 12469
 
+[transport-http]
+PORT = 12470
diff --git a/src/core/test_core_quota_peer2.conf b/src/core/test_core_quota_peer2.conf
index 03c684cff..65d0710bb 100644
--- a/src/core/test_core_quota_peer2.conf
+++ b/src/core/test_core_quota_peer2.conf
@@ -1,53 +1,50 @@
 @INLINE@ test_core_defaults.conf
 [PATHS]
-GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-core-quota-sym-peer-2/
+GNUNET_TEST_HOME = $GNUNET_TMP/test-gnunet-core-peer-2/
 
 [arm]
-PORT = 22476
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2-service-arm.sock
+PORT = 22460
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-arm.sock
 
 [statistics]
-PORT = 22477
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2-service-statistics.sock
+PORT = 22461
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-statistics.sock
 
 [resolver]
-PORT = 22474
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2-service-resolver.sock
+PORT = 22462
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-resolver.sock
 
 [peerinfo]
-PORT = 22479
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2-service-peerinfo.sock
+PORT = 22463
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-peerinfo.sock
 
 [transport]
-PORT = 22475
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2-service-transport.sock
+PORT = 22464
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-transport.sock
 
 [core]
-PORT = 22480
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2-service-core.sock
-
-[nat]
-PORT = 22481
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2.service-nat.sock
+PORT = 22475
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-core.sock
 
 [ats]
-PORT = 22482
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-core-sym-p2-service-ats.sock
+PORT = 22476
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-p2-service-ats.sock
 # UNSPECIFIED
-UNSPECIFIED_QUOTA_IN = 10240
-UNSPECIFIED_QUOTA_OUT = 10240
+UNSPECIFIED_QUOTA_IN = 10 MiB
+UNSPECIFIED_QUOTA_OUT = 10 MiB
 # LOOPBACK
-LOOPBACK_QUOTA_IN = 10240
-LOOPBACK_QUOTA_OUT = 10240
+LOOPBACK_QUOTA_IN = 10 MiB
+LOOPBACK_QUOTA_OUT = 10 MiB
 # LAN
-LAN_QUOTA_IN = 10240
-LAN_QUOTA_OUT = 10240
+LAN_QUOTA_IN = 10 MiB
+LAN_QUOTA_OUT = 10 MiB
 # WAN
-WAN_QUOTA_IN = 10240
-WAN_QUOTA_OUT = 10240
+WAN_QUOTA_IN = 10 MiB
+WAN_QUOTA_OUT = 10 MiB
 # WLAN
-WLAN_QUOTA_IN = 10240
-WLAN_QUOTA_OUT = 10240
+WLAN_QUOTA_IN = 10 MiB
+WLAN_QUOTA_OUT = 10 MiB
+
 
 [transport-tcp]
 PORT = 22467
@@ -55,5 +52,8 @@ PORT = 22467
 [transport-udp]
 PORT = 22468
 
-[transport-http]
+[transport-unix]
 PORT = 22469
+
+[transport-http]
+PORT = 22470
diff --git a/src/curl/curl.c b/src/curl/curl.c
index b7452330f..eb9dd6a29 100644
--- a/src/curl/curl.c
+++ b/src/curl/curl.c
@@ -170,10 +170,93 @@ struct GNUNET_CURL_Context
    * Closure for @e cb.
    */
   void *cb_cls;
+
+  /**
+   * USERNAME:PASSWORD to use for client-authentication
+   * with all requests of this context, or NULL.
+   */
+  char *userpass;
+
+  /**
+   * Type of the TLS client certificate used, or NULL.
+   */
+  char *certtype;
+
+  /**
+   * File with the TLS client certificate, or NULL.
+   */
+  char *certfile;
+
+  /**
+   * File with the private key to authenticate the
+   * TLS client, or NULL.
+   */
+  char *keyfile;
+
+  /**
+   * Passphrase to decrypt @e keyfile, or NULL.
+   */
+  char *keypass;
+
 };
 
 
 /**
+ * Force use of the provided username and password
+ * for client authentication for all operations performed
+ * with @a ctx.
+ *
+ * @param ctx context to set authentication data for
+ * @param userpass string with "$USERNAME:$PASSWORD"
+ */
+void
+GNUNET_CURL_set_userpass (struct GNUNET_CURL_Context *ctx,
+                          const char *userpass)
+{
+  GNUNET_free (ctx->userpass);
+  if (NULL != userpass)
+    ctx->userpass = GNUNET_strdup (userpass);
+}
+
+
+/**
+ * Force use of the provided TLS client certificate
+ * for client authentication for all operations performed
+ * with @a ctx.
+ *
+ * Note that if the provided information is incorrect,
+ * the earliest operation that could fail is
+ * #GNUNET_CURL_job_add() or #GNUNET_CURL_job_add2()!
+ *
+ * @param ctx context to set authentication data for
+ * @param certtype type of the certificate
+ * @param certfile file with the certificate
+ * @param keyfile file with the private key
+ * @param keypass passphrase to decrypt @a keyfile (or NULL)
+ */
+void
+GNUNET_CURL_set_tlscert (struct GNUNET_CURL_Context *ctx,
+                         const char *certtype,
+                         const char *certfile,
+                         const char *keyfile,
+                         const char *keypass)
+{
+  GNUNET_free (ctx->certtype);
+  GNUNET_free (ctx->certfile);
+  GNUNET_free (ctx->keyfile);
+  GNUNET_free (ctx->keypass);
+  if (NULL != certtype)
+    ctx->certtype = GNUNET_strdup (certtype);
+  if (NULL != certfile)
+    ctx->certfile = GNUNET_strdup (certfile);
+  if (NULL != keyfile)
+    ctx->certtype = GNUNET_strdup (keyfile);
+  if (NULL != keypass)
+    ctx->certtype = GNUNET_strdup (keypass);
+}
+
+
+/**
  * Initialise this library.  This function should be called before using any of
  * the following functions.
  *
@@ -457,6 +540,32 @@ GNUNET_CURL_job_add2 (struct GNUNET_CURL_Context *ctx,
   struct curl_slist *all_headers;
 
   GNUNET_assert (NULL != jcc);
+  if ( (NULL != ctx->userpass) &&
+       (0 != curl_easy_setopt (eh,
+                               CURLOPT_USERPWD,
+                               ctx->userpass)) )
+    return NULL;
+  if ( (NULL != ctx->certfile) &&
+       (0 != curl_easy_setopt (eh,
+                               CURLOPT_SSLCERT,
+                               ctx->certfile)) )
+    return NULL;
+  if ( (NULL != ctx->certtype) &&
+       (0 != curl_easy_setopt (eh,
+                               CURLOPT_SSLCERTTYPE,
+                               ctx->certtype)) )
+    return NULL;
+  if ( (NULL != ctx->keyfile) &&
+       (0 != curl_easy_setopt (eh,
+                               CURLOPT_SSLKEY,
+                               ctx->keyfile)) )
+    return NULL;
+  if ( (NULL != ctx->keypass) &&
+       (0 != curl_easy_setopt (eh,
+                               CURLOPT_KEYPASSWD,
+                               ctx->keypass)) )
+    return NULL;
+
   all_headers = setup_job_headers (ctx,
                                    job_headers);
   if (NULL == (job = setup_job (eh,
@@ -477,33 +586,27 @@ GNUNET_CURL_job_add2 (struct GNUNET_CURL_Context *ctx,
  * CURLOPT_PRIVATE facility of the CURL @a eh.
  *
  * This function modifies the CURL handle to add the
- * "Content-Type: application/json" header if @a add_json is set.
+ * "Content-Type: application/json" header.
  *
  * @param ctx context to execute the job in
  * @param eh curl easy handle for the request, will
  *           be executed AND cleaned up
- * @param add_json add "application/json" content type header
  * @param jcc callback to invoke upon completion
  * @param jcc_cls closure for @a jcc
  * @return NULL on error (in this case, @eh is still released!)
  */
 struct GNUNET_CURL_Job *
-GNUNET_CURL_job_add (struct GNUNET_CURL_Context *ctx,
-                     CURL *eh,
-                     int add_json,
-                     GNUNET_CURL_JobCompletionCallback jcc,
-                     void *jcc_cls)
+GNUNET_CURL_job_add_with_ct_json (struct GNUNET_CURL_Context *ctx,
+                                  CURL *eh,
+                                  GNUNET_CURL_JobCompletionCallback jcc,
+                                  void *jcc_cls)
 {
   struct GNUNET_CURL_Job *job;
   struct curl_slist *job_headers = NULL;
 
-  if (GNUNET_YES == add_json)
-  {
-    GNUNET_assert (
-      NULL != (job_headers =
-                 curl_slist_append (NULL, "Content-Type: application/json")));
-  }
-
+  GNUNET_assert (NULL != (job_headers =
+                            curl_slist_append (NULL,
+                                               "Content-Type: application/json")));
   job = GNUNET_CURL_job_add2 (ctx,
                               eh,
                               job_headers,
@@ -515,6 +618,32 @@ GNUNET_CURL_job_add (struct GNUNET_CURL_Context *ctx,
 
 
 /**
+ * Schedule a CURL request to be executed and call the given @a jcc
+ * upon its completion.  Note that the context will make use of the
+ * CURLOPT_PRIVATE facility of the CURL @a eh.
+ *
+ * @param ctx context to execute the job in
+ * @param eh curl easy handle for the request, will
+ *           be executed AND cleaned up
+ * @param jcc callback to invoke upon completion
+ * @param jcc_cls closure for @a jcc
+ * @return NULL on error (in this case, @eh is still released!)
+ */
+struct GNUNET_CURL_Job *
+GNUNET_CURL_job_add (struct GNUNET_CURL_Context *ctx,
+                     CURL *eh,
+                     GNUNET_CURL_JobCompletionCallback jcc,
+                     void *jcc_cls)
+{
+  return GNUNET_CURL_job_add2 (ctx,
+                               eh,
+                               NULL,
+                               jcc,
+                               jcc_cls);
+}
+
+
+/**
  * Cancel a job.  Must only be called before the job completion
  * callback is called for the respective job.
  *
@@ -529,7 +658,7 @@ GNUNET_CURL_job_cancel (struct GNUNET_CURL_Job *job)
   GNUNET_break (CURLM_OK ==
                 curl_multi_remove_handle (ctx->multi, job->easy_handle));
   curl_easy_cleanup (job->easy_handle);
-  GNUNET_free_non_null (job->db.buf);
+  GNUNET_free (job->db.buf);
   curl_slist_free_all (job->job_headers);
   ctx->cb (ctx->cb_cls);
   GNUNET_free (job);
@@ -642,7 +771,7 @@ GNUNET_CURL_download_get_result_ (struct GNUNET_CURL_DownloadBuffer *db,
       *response_code = 0;
     }
   }
-  GNUNET_free_non_null (db->buf);
+  GNUNET_free (db->buf);
   db->buf = NULL;
   db->buf_size = 0;
   if (NULL != json)
@@ -899,6 +1028,11 @@ GNUNET_CURL_fini (struct GNUNET_CURL_Context *ctx)
   curl_share_cleanup (ctx->share);
   curl_multi_cleanup (ctx->multi);
   curl_slist_free_all (ctx->common_headers);
+  GNUNET_free (ctx->userpass);
+  GNUNET_free (ctx->certtype);
+  GNUNET_free (ctx->certfile);
+  GNUNET_free (ctx->keyfile);
+  GNUNET_free (ctx->keypass);
   GNUNET_free (ctx);
 }
 
diff --git a/src/datacache/plugin_datacache_heap.c b/src/datacache/plugin_datacache_heap.c
index dbc9cac9c..074437e7d 100644
--- a/src/datacache/plugin_datacache_heap.c
+++ b/src/datacache/plugin_datacache_heap.c
@@ -395,7 +395,7 @@ heap_plugin_del (void *cls)
   plugin->env->delete_notify (plugin->env->cls,
                               &val->key,
                               val->size + OVERHEAD);
-  GNUNET_free_non_null (val->path_info);
+  GNUNET_free (val->path_info);
   GNUNET_free (val);
   return GNUNET_OK;
 }
@@ -577,7 +577,7 @@ libgnunet_plugin_datacache_heap_done (void *cls)
                      GNUNET_CONTAINER_multihashmap_remove (plugin->map,
                                                            &val->key,
                                                            val));
-      GNUNET_free_non_null (val->path_info);
+      GNUNET_free (val->path_info);
       GNUNET_free (val);
     }
     GNUNET_CONTAINER_heap_destroy (plugin->heaps[i]);
diff --git a/src/datacache/plugin_datacache_sqlite.c b/src/datacache/plugin_datacache_sqlite.c
index 55a8a7fae..a7da6b068 100644
--- a/src/datacache/plugin_datacache_sqlite.c
+++ b/src/datacache/plugin_datacache_sqlite.c
@@ -764,7 +764,7 @@ libgnunet_plugin_datacache_sqlite_done (void *cls)
 #if ! WINDOWS || defined(__CYGWIN__)
   if ((NULL != plugin->fn) && (0 != unlink (plugin->fn)))
     LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING, "unlink", plugin->fn);
-  GNUNET_free_non_null (plugin->fn);
+  GNUNET_free (plugin->fn);
 #endif
   sqlite3_finalize (plugin->insert_stmt);
   sqlite3_finalize (plugin->get_count_stmt);
diff --git a/src/datastore/gnunet-service-datastore.c b/src/datastore/gnunet-service-datastore.c
index 3fc46e19c..1c9e5e463 100644
--- a/src/datastore/gnunet-service-datastore.c
+++ b/src/datastore/gnunet-service-datastore.c
@@ -1355,7 +1355,7 @@ cleaning_task (void *cls)
     GNUNET_SCHEDULER_cancel (stat_timeout_task);
     stat_timeout_task = NULL;
   }
-  GNUNET_free_non_null (plugin_name);
+  GNUNET_free (plugin_name);
   plugin_name = NULL;
   if (last_sync > 0)
     sync_stats ();
@@ -1490,7 +1490,7 @@ run (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 _ ("Could not use specified filename `%s' for bloomfilter.\n"),
                 NULL != fn ? fn : "");
-    GNUNET_free_non_null (fn);
+    GNUNET_free (fn);
     fn = NULL;
   }
   if (NULL != fn)
@@ -1566,7 +1566,7 @@ run (void *cls,
                                          5);  /* approx. 3% false positives at max use */
     refresh_bf = GNUNET_YES;
   }
-  GNUNET_free_non_null (fn);
+  GNUNET_free (fn);
   if (NULL == filter)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
diff --git a/src/datastore/plugin_datastore_sqlite.c b/src/datastore/plugin_datastore_sqlite.c
index b3b30f256..cecc37978 100644
--- a/src/datastore/plugin_datastore_sqlite.c
+++ b/src/datastore/plugin_datastore_sqlite.c
@@ -550,7 +550,7 @@ database_shutdown (struct Plugin *plugin)
 #endif
   if (SQLITE_OK != result)
     LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR, "sqlite3_close");
-  GNUNET_free_non_null (plugin->fn);
+  GNUNET_free (plugin->fn);
 }
 
 
@@ -640,7 +640,7 @@ sqlite_plugin_put (void *cls,
                       GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
                       "sqlite3_step");
       cont (cont_cls, key, size, GNUNET_SYSERR, msg);
-      GNUNET_free_non_null (msg);
+      GNUNET_free (msg);
       return;
     }
     int changes = sqlite3_changes (plugin->dbh);
@@ -724,12 +724,12 @@ sqlite_plugin_put (void *cls,
     database_shutdown (plugin);
     database_setup (plugin->env->cfg, plugin);
     cont (cont_cls, key, size, GNUNET_SYSERR, msg);
-    GNUNET_free_non_null (msg);
+    GNUNET_free (msg);
     return;
   }
   GNUNET_SQ_reset (plugin->dbh, stmt);
   cont (cont_cls, key, size, ret, msg);
-  GNUNET_free_non_null (msg);
+  GNUNET_free (msg);
 }
 
 
diff --git a/src/datastore/test_datastore_api.c b/src/datastore/test_datastore_api.c
index dbe590bab..e72a6acd3 100644
--- a/src/datastore/test_datastore_api.c
+++ b/src/datastore/test_datastore_api.c
@@ -198,7 +198,7 @@ check_success (void *cls,
                 msg);
     crc->phase = RP_ERROR;
   }
-  GNUNET_free_non_null (crc->data);
+  GNUNET_free (crc->data);
   crc->data = NULL;
   GNUNET_SCHEDULER_add_now (&run_continuation, crc);
 }
diff --git a/src/datastore/test_datastore_api_management.c b/src/datastore/test_datastore_api_management.c
index 7bec0d064..175765267 100644
--- a/src/datastore/test_datastore_api_management.c
+++ b/src/datastore/test_datastore_api_management.c
@@ -131,7 +131,7 @@ check_success (void *cls, int success, struct GNUNET_TIME_Absolute
   if (GNUNET_OK != success)
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s\n", msg);
   GNUNET_assert (GNUNET_OK == success);
-  GNUNET_free_non_null (crc->data);
+  GNUNET_free (crc->data);
   crc->data = NULL;
   GNUNET_SCHEDULER_add_now (&run_continuation, crc);
 }
diff --git a/src/dht/dht_api.c b/src/dht/dht_api.c
index c6443f102..1eaed8a5c 100644
--- a/src/dht/dht_api.c
+++ b/src/dht/dht_api.c
@@ -1258,7 +1258,7 @@ GNUNET_DHT_monitor_stop (struct GNUNET_DHT_MonitorHandle *mh)
   }
   GNUNET_MQ_send (handle->mq,
                   env);
-  GNUNET_free_non_null (mh->key);
+  GNUNET_free (mh->key);
   GNUNET_free (mh);
 }
 
diff --git a/src/dht/gnunet-service-dht.c b/src/dht/gnunet-service-dht.c
index 2dd49a1b6..da46dcfee 100644
--- a/src/dht/gnunet-service-dht.c
+++ b/src/dht/gnunet-service-dht.c
@@ -69,7 +69,7 @@ static void
 process_hello (void *cls,
                const struct GNUNET_MessageHeader *message)
 {
-  GNUNET_free_non_null (GDS_my_hello);
+  GNUNET_free (GDS_my_hello);
   GDS_my_hello = GNUNET_malloc (ntohs (message->size));
   GNUNET_memcpy (GDS_my_hello,
                  message,
@@ -106,7 +106,7 @@ shutdown_task (void *cls)
                                GNUNET_YES);
     GDS_stats = NULL;
   }
-  GNUNET_free_non_null (GDS_my_hello);
+  GNUNET_free (GDS_my_hello);
   GDS_my_hello = NULL;
   GDS_CLIENTS_stop ();
 }
diff --git a/src/dht/gnunet-service-dht_clients.c b/src/dht/gnunet-service-dht_clients.c
index be6e22d01..1e44c1fad 100644
--- a/src/dht/gnunet-service-dht_clients.c
+++ b/src/dht/gnunet-service-dht_clients.c
@@ -333,7 +333,7 @@ client_disconnect_cb (void *cls,
       struct ClientMonitorRecord *next;
 
       next = monitor->next;
-      GNUNET_free_non_null (monitor->key);
+      GNUNET_free (monitor->key);
       GNUNET_CONTAINER_DLL_remove (monitor_head,
                                    monitor_tail,
                                    monitor);
@@ -938,7 +938,7 @@ handle_dht_local_monitor_stop (void *cls,
       GNUNET_CONTAINER_DLL_remove (monitor_head,
                                    monitor_tail,
                                    r);
-      GNUNET_free_non_null (r->key);
+      GNUNET_free (r->key);
       GNUNET_free (r);
       return;     /* Delete only ONE entry */
     }
@@ -1281,7 +1281,7 @@ GDS_CLIENTS_process_get (uint32_t options,
                       env);
     }
   }
-  GNUNET_free_non_null (cl);
+  GNUNET_free (cl);
 }
 
 
@@ -1363,7 +1363,7 @@ GDS_CLIENTS_process_get_resp (enum GNUNET_BLOCK_Type type,
                       env);
     }
   }
-  GNUNET_free_non_null (cl);
+  GNUNET_free (cl);
 }
 
 
@@ -1445,7 +1445,7 @@ GDS_CLIENTS_process_put (uint32_t options,
                       env);
     }
   }
-  GNUNET_free_non_null (cl);
+  GNUNET_free (cl);
 }
 
 
diff --git a/src/dht/gnunet-service-dht_hello.c b/src/dht/gnunet-service-dht_hello.c
index a0141d1fb..906391334 100644
--- a/src/dht/gnunet-service-dht_hello.c
+++ b/src/dht/gnunet-service-dht_hello.c
@@ -86,7 +86,7 @@ process_hello (void *cls,
                             gettext_noop ("# HELLOs obtained from peerinfo"), 1,
                             GNUNET_NO);
   hm = GNUNET_CONTAINER_multipeermap_get (peer_to_hello, peer);
-  GNUNET_free_non_null (hm);
+  GNUNET_free (hm);
   hm = GNUNET_malloc (GNUNET_HELLO_size (hello));
   GNUNET_memcpy (hm, hello, GNUNET_HELLO_size (hello));
   GNUNET_assert (GNUNET_SYSERR !=
diff --git a/src/dht/gnunet-service-dht_neighbours.c b/src/dht/gnunet-service-dht_neighbours.c
index fce69d3f6..b211fca6b 100644
--- a/src/dht/gnunet-service-dht_neighbours.c
+++ b/src/dht/gnunet-service-dht_neighbours.c
@@ -1436,7 +1436,7 @@ GDS_NEIGHBOURS_handle_get (enum GNUNET_BLOCK_Type type,
   if (msize + sizeof(struct PeerGetMessage) >= GNUNET_MAX_MESSAGE_SIZE)
   {
     GNUNET_break (0);
-    GNUNET_free_non_null (reply_bf);
+    GNUNET_free (reply_bf);
     GNUNET_free (targets);
     return GNUNET_NO;
   }
@@ -1493,7 +1493,7 @@ GDS_NEIGHBOURS_handle_get (enum GNUNET_BLOCK_Type type,
                     env);
   }
   GNUNET_free (targets);
-  GNUNET_free_non_null (reply_bf);
+  GNUNET_free (reply_bf);
   return (skip_count < target_count) ? GNUNET_OK : GNUNET_NO;
 }
 
diff --git a/src/dht/gnunet_dht_profiler.c b/src/dht/gnunet_dht_profiler.c
index 5a73880be..ba50c3d1a 100644
--- a/src/dht/gnunet_dht_profiler.c
+++ b/src/dht/gnunet_dht_profiler.c
@@ -323,7 +323,7 @@ do_shutdown (void *cls)
     GNUNET_TESTBED_operation_done (bandwidth_stats_op);
     bandwidth_stats_op = NULL;
   }
-  GNUNET_free_non_null (a_ac);
+  GNUNET_free (a_ac);
 }
 
 
diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am
index 17be841f5..45107304b 100644
--- a/src/dns/Makefile.am
+++ b/src/dns/Makefile.am
@@ -81,6 +81,11 @@ libgnunet_plugin_block_dns_la_SOURCES = \
   plugin_block_dns.c
 libgnunet_plugin_block_dns_la_LIBADD = \
   $(top_builddir)/src/block/libgnunetblockgroup.la \
+  $(top_builddir)/src/block/libgnunetblock.la \
+  $(top_builddir)/src/util/libgnunetutil.la
+libgnunet_plugin_block_dns_la_DEPENDENCIES = \
+  $(top_builddir)/src/block/libgnunetblockgroup.la \
+  $(top_builddir)/src/block/libgnunetblock.la \
   $(top_builddir)/src/util/libgnunetutil.la
 libgnunet_plugin_block_dns_la_LDFLAGS = \
   $(GN_LIBINTL) \
diff --git a/src/dns/gnunet-dns-monitor.c b/src/dns/gnunet-dns-monitor.c
index f6c0d0660..d9830baa4 100644
--- a/src/dns/gnunet-dns-monitor.c
+++ b/src/dns/gnunet-dns-monitor.c
@@ -233,7 +233,7 @@ display_record (const struct GNUNET_DNSPARSER_Record *record)
            (unsigned int) (GNUNET_TIME_absolute_get_remaining (
                              record->expiration_time).rel_value_us / 1000LL
                            / 1000LL));
-  GNUNET_free_non_null (tmp);
+  GNUNET_free (tmp);
 }
 
 
diff --git a/src/dns/gnunet-dns-redirector.c b/src/dns/gnunet-dns-redirector.c
index 606864c8a..835497dba 100644
--- a/src/dns/gnunet-dns-redirector.c
+++ b/src/dns/gnunet-dns-redirector.c
@@ -172,7 +172,7 @@ modify_request (void *cls,
                "Injecting modified DNS response\n");
     GNUNET_DNS_request_answer (rh, len, buf);
   }
-  GNUNET_free_non_null (buf);
+  GNUNET_free (buf);
 }
 
 
diff --git a/src/dns/gnunet-service-dns.c b/src/dns/gnunet-service-dns.c
index 25fbcf430..1cb238add 100644
--- a/src/dns/gnunet-service-dns.c
+++ b/src/dns/gnunet-service-dns.c
@@ -257,7 +257,7 @@ static struct GNUNET_DNSSTUB_Context *dnsstub;
 static void
 cleanup_rr (struct RequestRecord *rr)
 {
-  GNUNET_free_non_null (rr->payload);
+  GNUNET_free (rr->payload);
   rr->payload = NULL;
   rr->payload_length = 0;
   GNUNET_array_grow (rr->client_wait_list,
@@ -280,7 +280,7 @@ cleanup_task (void *cls GNUNET_UNUSED)
     hijacker = NULL;
   }
   for (unsigned int i = 0; i < 8; i++)
-    GNUNET_free_non_null (helper_argv[i]);
+    GNUNET_free (helper_argv[i]);
   for (unsigned int i = 0; i <= UINT16_MAX; i++)
     cleanup_rr (&requests[i]);
   if (NULL != stats)
@@ -762,7 +762,7 @@ process_dns_result (void *cls,
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Got a response from the stub resolver for DNS request %llu intercepted locally!\n",
        (unsigned long long) rr->request_id);
-  GNUNET_free_non_null (rr->payload);
+  GNUNET_free (rr->payload);
   rr->payload = GNUNET_malloc (r);
   GNUNET_memcpy (rr->payload,
                  dns,
@@ -862,7 +862,7 @@ handle_client_response (void *cls,
         next_phase (rr);
         return;
       }
-      GNUNET_free_non_null (rr->payload);
+      GNUNET_free (rr->payload);
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "Changing DNS reply according to client specifications\n");
       rr->payload = GNUNET_malloc (msize);
@@ -1005,7 +1005,7 @@ process_helper_messages (void *cls,
   rr = &requests[dns->id];
 
   /* clean up from previous request */
-  GNUNET_free_non_null (rr->payload);
+  GNUNET_free (rr->payload);
   rr->payload = NULL;
   GNUNET_array_grow (rr->client_wait_list,
                      rr->client_wait_list_length,
@@ -1115,7 +1115,7 @@ run (void *cls,
                                "dns",
                                "DNS_EXIT",
                                _ ("need a valid IPv4 or IPv6 address\n"));
-    GNUNET_free_non_null (dns_exit);
+    GNUNET_free (dns_exit);
   }
   binary = GNUNET_OS_get_suid_binary_path (cfg, "gnunet-helper-dns");
 
diff --git a/src/exit/gnunet-daemon-exit.c b/src/exit/gnunet-daemon-exit.c
index b193176c4..27eba018f 100644
--- a/src/exit/gnunet-daemon-exit.c
+++ b/src/exit/gnunet-daemon-exit.c
@@ -2471,7 +2471,7 @@ free_service_record (void *cls,
                                                        key,
                                                        service));
   GNUNET_CADET_close_port (service->port);
-  GNUNET_free_non_null (service->name);
+  GNUNET_free (service->name);
   GNUNET_free (service);
   return GNUNET_OK;
 }
@@ -2613,7 +2613,7 @@ store_service (int proto,
                                          GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY))
   {
     GNUNET_CADET_close_port (service->port);
-    GNUNET_free_non_null (service->name);
+    GNUNET_free (service->name);
     GNUNET_free (service);
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 _ ("Got duplicate service records for `%s:%u'\n"),
@@ -3340,7 +3340,7 @@ cleanup (void *cls)
     stats = NULL;
   }
   for (i = 0; i < 8; i++)
-    GNUNET_free_non_null (exit_argv[i]);
+    GNUNET_free (exit_argv[i]);
 }
 
 
@@ -3706,7 +3706,7 @@ advertise_dns_exit ()
                                "dns",
                                "DNS_RESOLVER",
                                _ ("need a valid IPv4 or IPv6 address\n"));
-    GNUNET_free_non_null (dns_exit);
+    GNUNET_free (dns_exit);
     return;
   }
   /* open port */
@@ -3807,7 +3807,7 @@ setup_exit_helper_args ()
       GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
                                  "EXIT",
                                  "IPV6ADDR");
-      GNUNET_free_non_null (ipv6addr);
+      GNUNET_free (ipv6addr);
       return GNUNET_SYSERR;
     }
     exit_argv[3] = ipv6addr;
@@ -3858,7 +3858,7 @@ setup_exit_helper_args ()
       GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
                                  "EXIT",
                                  "IPV4ADDR");
-      GNUNET_free_non_null (ipv4addr);
+      GNUNET_free (ipv4addr);
       return GNUNET_SYSERR;
     }
     exit_argv[5] = ipv4addr;
@@ -3875,7 +3875,7 @@ setup_exit_helper_args ()
       GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
                                  "EXIT",
                                  "IPV4MASK");
-      GNUNET_free_non_null (ipv4mask);
+      GNUNET_free (ipv4mask);
       return GNUNET_SYSERR;
     }
     exit_argv[6] = ipv4mask;
@@ -4023,7 +4023,7 @@ run (void *cls,
       regex = NULL;
     else
       regex = GNUNET_TUN_ipv4policy2regex (policy);
-    GNUNET_free_non_null (policy);
+    GNUNET_free (policy);
     if (NULL != regex)
     {
       (void) GNUNET_asprintf (&prefixed_regex,
@@ -4063,7 +4063,7 @@ run (void *cls,
       regex = NULL;
     else
       regex = GNUNET_TUN_ipv6policy2regex (policy);
-    GNUNET_free_non_null (policy);
+    GNUNET_free (policy);
     if (NULL != regex)
     {
       (void) GNUNET_asprintf (&prefixed_regex,
diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index b1555be60..25590c6f7 100644
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -46,8 +46,13 @@ libgnunetfs_la_SOURCES = \
 
 libgnunetfs_la_LIBADD = \
   $(top_builddir)/src/datastore/libgnunetdatastore.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL) $(XLIB) $(LIBGCRYPT_LIBS) -lunistring
+libgnunetfs_la_DEPENDENCIES = \
+  $(top_builddir)/src/datastore/libgnunetdatastore.la \
+  $(top_builddir)/src/statistics/libgnunetstatistics.la \
+  $(top_builddir)/src/util/libgnunetutil.la
 
 if HAVE_LIBEXTRACTOR
 libgnunetfs_la_LIBADD += \
diff --git a/src/fs/fs_api.c b/src/fs/fs_api.c
index 3d2ba3e99..920786146 100644
--- a/src/fs/fs_api.c
+++ b/src/fs/fs_api.c
@@ -570,7 +570,7 @@ GNUNET_FS_data_reader_copy_ (void *cls,
     return 0;
   if (0 == max)
   {
-    GNUNET_free_non_null (data);
+    GNUNET_free (data);
     return 0;
   }
   GNUNET_memcpy (buf, &data[offset], max);
@@ -1132,15 +1132,15 @@ deserialize_fi_node (struct GNUNET_FS_Handle *h,
     GNUNET_free (filename);
     filename = NULL;
   }
-  GNUNET_free_non_null (ksks);
-  GNUNET_free_non_null (skss);
-  GNUNET_free_non_null (chks);
+  GNUNET_free (ksks);
+  GNUNET_free (skss);
+  GNUNET_free (chks);
   return ret;
 cleanup:
-  GNUNET_free_non_null (ksks);
-  GNUNET_free_non_null (chks);
-  GNUNET_free_non_null (skss);
-  GNUNET_free_non_null (filename);
+  GNUNET_free (ksks);
+  GNUNET_free (chks);
+  GNUNET_free (skss);
+  GNUNET_free (filename);
   GNUNET_FS_file_information_destroy (ret, NULL, NULL);
   return NULL;
 }
@@ -1417,11 +1417,11 @@ GNUNET_FS_file_information_sync_ (struct GNUNET_FS_FileInformation *fi)
     GNUNET_break (0);
     goto cleanup;
   }
-  GNUNET_free_non_null (chks);
+  GNUNET_free (chks);
   chks = NULL;
-  GNUNET_free_non_null (ksks);
+  GNUNET_free (ksks);
   ksks = NULL;
-  GNUNET_free_non_null (skss);
+  GNUNET_free (skss);
   skss = NULL;
 
   switch (b)
@@ -1527,9 +1527,9 @@ GNUNET_FS_file_information_sync_ (struct GNUNET_FS_FileInformation *fi)
 cleanup:
   if (NULL != wh)
     (void) GNUNET_BIO_write_close (wh, NULL);
-  GNUNET_free_non_null (chks);
-  GNUNET_free_non_null (ksks);
-  GNUNET_free_non_null (skss);
+  GNUNET_free (chks);
+  GNUNET_free (ksks);
+  GNUNET_free (skss);
   fn = get_serialization_file_name (fi->h,
                                     GNUNET_FS_SYNC_PATH_FILE_INFO,
                                     fi->serialization);
@@ -1729,10 +1729,10 @@ deserialize_publish_file (void *cls, const char *filename)
   pc->top = GNUNET_FS_make_top (h, &GNUNET_FS_publish_signal_suspend_, pc);
   return GNUNET_OK;
 cleanup:
-  GNUNET_free_non_null (pc->nid);
-  GNUNET_free_non_null (pc->nuid);
-  GNUNET_free_non_null (fi_root);
-  GNUNET_free_non_null (fi_pos);
+  GNUNET_free (pc->nid);
+  GNUNET_free (pc->nuid);
+  GNUNET_free (fi_root);
+  GNUNET_free (fi_pos);
   if ((NULL != rh) && (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg)))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
@@ -2131,7 +2131,7 @@ GNUNET_FS_download_sync_ (struct GNUNET_FS_DownloadContext *dc)
       goto cleanup;
     }
   }
-  GNUNET_free_non_null (uris);
+  GNUNET_free (uris);
   uris = NULL;
   if (GNUNET_OK != GNUNET_BIO_write_close (wh, NULL))
   {
@@ -2144,7 +2144,7 @@ GNUNET_FS_download_sync_ (struct GNUNET_FS_DownloadContext *dc)
 cleanup:
   if (NULL != wh)
     (void) GNUNET_BIO_write_close (wh, NULL);
-  GNUNET_free_non_null (uris);
+  GNUNET_free (uris);
   if (0 != unlink (fn))
     GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "unlink", fn);
   GNUNET_free (fn);
@@ -2235,10 +2235,10 @@ GNUNET_FS_search_result_sync_ (struct GNUNET_FS_SearchResult *sr)
     GNUNET_break (0);
     goto cleanup;
   }
-  GNUNET_free_non_null (uris);
+  GNUNET_free (uris);
   return;
 cleanup:
-  GNUNET_free_non_null (uris);
+  GNUNET_free (uris);
   if (NULL != wh)
     (void) GNUNET_BIO_write_close (wh, NULL);
   remove_sync_file_in_dir (sr->h,
@@ -2309,7 +2309,7 @@ GNUNET_FS_search_sync_ (struct GNUNET_FS_SearchContext *sc)
 cleanup:
   if (NULL != wh)
     (void) GNUNET_BIO_write_close (wh, NULL);
-  GNUNET_free_non_null (uris);
+  GNUNET_free (uris);
   GNUNET_FS_remove_sync_file_ (sc->h, category, sc->serialization);
   GNUNET_free (sc->serialization);
   sc->serialization = NULL;
@@ -2359,7 +2359,7 @@ deserialize_unindex_file (void *cls, const char *filename)
       (GNUNET_OK != GNUNET_BIO_read_int32 (rh, "ksk offset",
                                            (int32_t *) &uc->ksk_offset)))
   {
-    GNUNET_free_non_null (uris);
+    GNUNET_free (uris);
     GNUNET_break (0);
     goto cleanup;
   }
@@ -2370,7 +2370,7 @@ deserialize_unindex_file (void *cls, const char *filename)
     if (NULL == uc->ksk_uri)
     {
       GNUNET_break (0);
-      GNUNET_free_non_null (emsg);
+      GNUNET_free (emsg);
       goto cleanup;
     }
   }
@@ -2472,7 +2472,7 @@ deserialize_unindex_file (void *cls, const char *filename)
   }
   return GNUNET_OK;
 cleanup:
-  GNUNET_free_non_null (uc->filename);
+  GNUNET_free (uc->filename);
   if ((NULL != rh) && (GNUNET_OK != GNUNET_BIO_read_close (rh, &emsg)))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
@@ -2485,7 +2485,7 @@ cleanup:
     GNUNET_FS_remove_sync_file_ (h,
                                  GNUNET_FS_SYNC_PATH_MASTER_UNINDEX,
                                  uc->serialization);
-  GNUNET_free_non_null (uc->serialization);
+  GNUNET_free (uc->serialization);
   GNUNET_free (uc);
   return GNUNET_OK;
 }
@@ -2665,10 +2665,10 @@ deserialize_search_result (void *cls, const char *filename)
   }
   return GNUNET_OK;
 cleanup:
-  GNUNET_free_non_null (download);
-  GNUNET_free_non_null (emsg);
-  GNUNET_free_non_null (uris);
-  GNUNET_free_non_null (update_srch);
+  GNUNET_free (download);
+  GNUNET_free (emsg);
+  GNUNET_free (uris);
+  GNUNET_free (update_srch);
   if (NULL != sr->uri)
     GNUNET_FS_uri_destroy (sr->uri);
   if (NULL != sr->meta)
@@ -2823,8 +2823,8 @@ free_search_context (struct GNUNET_FS_SearchContext *sc)
                                 : GNUNET_FS_SYNC_PATH_CHILD_SEARCH,
                                 sc->serialization);
   }
-  GNUNET_free_non_null (sc->serialization);
-  GNUNET_free_non_null (sc->emsg);
+  GNUNET_free (sc->serialization);
+  GNUNET_free (sc->emsg);
   if (NULL != sc->uri)
     GNUNET_FS_uri_destroy (sc->uri);
   if (NULL != sc->master_result_map)
@@ -2896,10 +2896,10 @@ free_download_context (struct GNUNET_FS_DownloadContext *dc)
     GNUNET_CONTAINER_meta_data_destroy (dc->meta);
   if (NULL != dc->uri)
     GNUNET_FS_uri_destroy (dc->uri);
-  GNUNET_free_non_null (dc->temp_filename);
-  GNUNET_free_non_null (dc->emsg);
-  GNUNET_free_non_null (dc->filename);
-  GNUNET_free_non_null (dc->serialization);
+  GNUNET_free (dc->temp_filename);
+  GNUNET_free (dc->emsg);
+  GNUNET_free (dc->filename);
+  GNUNET_free (dc->serialization);
   while (NULL != (dcc = dc->child_head))
   {
     GNUNET_CONTAINER_DLL_remove (dc->child_head, dc->child_tail, dcc);
@@ -3020,8 +3020,8 @@ deserialize_download (struct GNUNET_FS_Handle *h,
   dc->task = GNUNET_SCHEDULER_add_now (&GNUNET_FS_download_start_task_, dc);
   return;
 cleanup:
-  GNUNET_free_non_null (uris);
-  GNUNET_free_non_null (emsg);
+  GNUNET_free (uris);
+  GNUNET_free (emsg);
   free_download_context (dc);
 }
 
@@ -3127,9 +3127,9 @@ deserialize_search (struct GNUNET_FS_Handle *h,
   GNUNET_free (uris);
   return sc;
 cleanup:
-  GNUNET_free_non_null (emsg);
+  GNUNET_free (emsg);
   free_search_context (sc);
-  GNUNET_free_non_null (uris);
+  GNUNET_free (uris);
   return NULL;
 }
 
diff --git a/src/fs/fs_directory.c b/src/fs/fs_directory.c
index 1ef5fa3bb..9a198d8d7 100644
--- a/src/fs/fs_directory.c
+++ b/src/fs/fs_directory.c
@@ -309,8 +309,8 @@ GNUNET_FS_directory_list_contents (size_t size,
            full_data.size,
            full_data.data);
     }
-    GNUNET_free_non_null (full_data.data);
-    GNUNET_free_non_null (filename);
+    GNUNET_free (full_data.data);
+    GNUNET_free (filename);
     GNUNET_CONTAINER_meta_data_destroy (md);
     GNUNET_FS_uri_destroy (uri);
   }
@@ -630,9 +630,9 @@ GNUNET_FS_directory_builder_finish (struct GNUNET_FS_DirectoryBuilder *bld,
                          "malloc");
     *rsize = 0;
     *rdata = NULL;
-    GNUNET_free_non_null (sizes);
-    GNUNET_free_non_null (perm);
-    GNUNET_free_non_null (bes);
+    GNUNET_free (sizes);
+    GNUNET_free (perm);
+    GNUNET_free (bes);
     return GNUNET_SYSERR;
   }
   *rdata = data;
@@ -662,9 +662,9 @@ GNUNET_FS_directory_builder_finish (struct GNUNET_FS_DirectoryBuilder *bld,
     GNUNET_memcpy (&data[off - sizes[i]], &(bes[i])[1], sizes[i]);
     GNUNET_free (bes[i]);
   }
-  GNUNET_free_non_null (sizes);
-  GNUNET_free_non_null (perm);
-  GNUNET_free_non_null (bes);
+  GNUNET_free (sizes);
+  GNUNET_free (perm);
+  GNUNET_free (bes);
   GNUNET_assert (off == size);
   GNUNET_CONTAINER_meta_data_destroy (bld->meta);
   GNUNET_free (bld);
diff --git a/src/fs/fs_dirmetascan.c b/src/fs/fs_dirmetascan.c
index 11efa053b..cb50182f9 100644
--- a/src/fs/fs_dirmetascan.c
+++ b/src/fs/fs_dirmetascan.c
@@ -106,7 +106,7 @@ GNUNET_FS_directory_scan_abort (struct GNUNET_FS_DirScanner *ds)
     GNUNET_FS_share_tree_free (ds->toplevel);
   if (NULL != ds->stop_task)
     GNUNET_SCHEDULER_cancel (ds->stop_task);
-  GNUNET_free_non_null (ds->ex_arg);
+  GNUNET_free (ds->ex_arg);
   GNUNET_free (ds->filename_expanded);
   GNUNET_free (ds);
 }
diff --git a/src/fs/fs_download.c b/src/fs/fs_download.c
index 4d03b6546..6154e8be0 100644
--- a/src/fs/fs_download.c
+++ b/src/fs/fs_download.c
@@ -960,7 +960,7 @@ trigger_recursive_download (void *cls,
                   "Failed to create directory for recursive download of `%s'\n"),
                 full_name);
     GNUNET_free (full_name);
-    GNUNET_free_non_null (fn);
+    GNUNET_free (fn);
     return;
   }
 
@@ -981,9 +981,9 @@ trigger_recursive_download (void *cls,
                             dc->options,
                             NULL,
                             dc);
-  GNUNET_free_non_null (full_name);
-  GNUNET_free_non_null (temp_name);
-  GNUNET_free_non_null (fn);
+  GNUNET_free (full_name);
+  GNUNET_free (temp_name);
+  GNUNET_free (fn);
 }
 
 
@@ -999,7 +999,7 @@ GNUNET_FS_free_download_request_ (struct DownloadRequest *dr)
     return;
   for (unsigned int i = 0; i < dr->num_children; i++)
     GNUNET_FS_free_download_request_ (dr->children[i]);
-  GNUNET_free_non_null (dr->children);
+  GNUNET_free (dr->children);
   GNUNET_free (dr);
 }
 
@@ -2011,11 +2011,11 @@ GNUNET_FS_download_signal_suspend_ (void *cls)
     GNUNET_CONTAINER_multihashmap_destroy (dc->active);
     dc->active = NULL;
   }
-  GNUNET_free_non_null (dc->filename);
+  GNUNET_free (dc->filename);
   GNUNET_CONTAINER_meta_data_destroy (dc->meta);
   GNUNET_FS_uri_destroy (dc->uri);
-  GNUNET_free_non_null (dc->temp_filename);
-  GNUNET_free_non_null (dc->serialization);
+  GNUNET_free (dc->temp_filename);
+  GNUNET_free (dc->serialization);
   GNUNET_assert (NULL == dc->job_queue);
   GNUNET_free (dc);
 }
@@ -2409,7 +2409,7 @@ GNUNET_FS_download_stop (struct GNUNET_FS_DownloadContext *dc, int do_delete)
                                 dc->temp_filename);
     GNUNET_free (dc->temp_filename);
   }
-  GNUNET_free_non_null (dc->serialization);
+  GNUNET_free (dc->serialization);
   GNUNET_assert (NULL == dc->job_queue);
   GNUNET_free (dc);
 }
diff --git a/src/fs/fs_file_information.c b/src/fs/fs_file_information.c
index 28bbf12dd..3324abd58 100644
--- a/src/fs/fs_file_information.c
+++ b/src/fs/fs_file_information.c
@@ -75,7 +75,7 @@ void
 GNUNET_FS_file_information_set_filename (struct GNUNET_FS_FileInformation *s,
                                          const char *filename)
 {
-  GNUNET_free_non_null (s->filename);
+  GNUNET_free (s->filename);
   if (filename)
     s->filename = GNUNET_strdup (filename);
   else
@@ -426,7 +426,7 @@ GNUNET_FS_file_information_destroy (struct GNUNET_FS_FileInformation *fi,
                &fi->bo,
                &no,
                &fi->client_info);
-    GNUNET_free_non_null (fi->data.dir.dir_data);
+    GNUNET_free (fi->data.dir.dir_data);
   }
   else
   {
@@ -447,8 +447,8 @@ GNUNET_FS_file_information_destroy (struct GNUNET_FS_FileInformation *fi,
                &fi->data.file.do_index,
                &fi->client_info);
   }
-  GNUNET_free_non_null (fi->filename);
-  GNUNET_free_non_null (fi->emsg);
+  GNUNET_free (fi->filename);
+  GNUNET_free (fi->emsg);
   if (NULL != fi->sks_uri)
     GNUNET_FS_uri_destroy (fi->sks_uri);
   if (NULL != fi->chk_uri)
@@ -462,7 +462,7 @@ GNUNET_FS_file_information_destroy (struct GNUNET_FS_FileInformation *fi,
     GNUNET_FS_uri_destroy (fi->keywords);
   if (NULL != fi->meta)
     GNUNET_CONTAINER_meta_data_destroy (fi->meta);
-  GNUNET_free_non_null (fi->serialization);
+  GNUNET_free (fi->serialization);
   if (NULL != fi->te)
   {
     GNUNET_FS_tree_encoder_finish (fi->te, NULL);
diff --git a/src/fs/fs_namespace.c b/src/fs/fs_namespace.c
index f098032d7..155486be5 100644
--- a/src/fs/fs_namespace.c
+++ b/src/fs/fs_namespace.c
@@ -214,13 +214,13 @@ write_update_information_graph (struct GNUNET_FS_UpdateInformationGraph *uig)
     n = uig->update_nodes[i];
     uris = GNUNET_FS_uri_to_string (n->uri);
     struct GNUNET_BIO_WriteSpec ws[] = {
-      GNUNET_BIO_write_spec_string("fs-namespace-node-id", n->id),
-      GNUNET_BIO_write_spec_meta_data("fs-namespace-node-meta", n->md),
-      GNUNET_BIO_write_spec_string("fs-namespace-node-update", n->update),
-      GNUNET_BIO_write_spec_string("fs-namespace-uris", uris),
-      GNUNET_BIO_write_spec_end(),
+      GNUNET_BIO_write_spec_string ("fs-namespace-node-id", n->id),
+      GNUNET_BIO_write_spec_meta_data ("fs-namespace-node-meta", n->md),
+      GNUNET_BIO_write_spec_string ("fs-namespace-node-update", n->update),
+      GNUNET_BIO_write_spec_string ("fs-namespace-uris", uris),
+      GNUNET_BIO_write_spec_end (),
     };
-    if (GNUNET_OK != GNUNET_BIO_write_spec_commit(wh, ws))
+    if (GNUNET_OK != GNUNET_BIO_write_spec_commit (wh, ws))
     {
       GNUNET_free (uris);
       break;
@@ -292,17 +292,17 @@ read_update_information_graph (struct GNUNET_FS_Handle *h,
   {
     n = GNUNET_new (struct NamespaceUpdateNode);
     struct GNUNET_BIO_ReadSpec rs[] = {
-      GNUNET_BIO_read_spec_string("identifier", &n->id, 1024),
-      GNUNET_BIO_read_spec_meta_data("meta", &n->md),
-      GNUNET_BIO_read_spec_string("update-id", &n->update, 1024),
-      GNUNET_BIO_read_spec_string("uri", &uris, 1024 * 2),
-      GNUNET_BIO_read_spec_end(),
+      GNUNET_BIO_read_spec_string ("identifier", &n->id, 1024),
+      GNUNET_BIO_read_spec_meta_data ("meta", &n->md),
+      GNUNET_BIO_read_spec_string ("update-id", &n->update, 1024),
+      GNUNET_BIO_read_spec_string ("uri", &uris, 1024 * 2),
+      GNUNET_BIO_read_spec_end (),
     };
     if (GNUNET_OK != GNUNET_BIO_read_spec_commit (rh, rs))
     {
       GNUNET_break (0);
-      GNUNET_free_non_null (n->id);
-      GNUNET_free_non_null (n->update);
+      GNUNET_free (n->id);
+      GNUNET_free (n->update);
       if (n->md != NULL)
         GNUNET_CONTAINER_meta_data_destroy (n->md);
       GNUNET_free (n);
@@ -315,7 +315,7 @@ read_update_information_graph (struct GNUNET_FS_Handle *h,
       GNUNET_break (0);
       GNUNET_free (emsg);
       GNUNET_free (n->id);
-      GNUNET_free_non_null (n->update);
+      GNUNET_free (n->update);
       GNUNET_CONTAINER_meta_data_destroy (n->md);
       GNUNET_free (n);
       break;
diff --git a/src/fs/fs_publish.c b/src/fs/fs_publish.c
index 8bb57b1e2..fddc65d67 100644
--- a/src/fs/fs_publish.c
+++ b/src/fs/fs_publish.c
@@ -85,9 +85,9 @@ publish_cleanup (struct GNUNET_FS_PublishContext *pc)
     pc->fhc = NULL;
   }
   GNUNET_FS_file_information_destroy (pc->fi, NULL, NULL);
-  GNUNET_free_non_null (pc->nid);
-  GNUNET_free_non_null (pc->nuid);
-  GNUNET_free_non_null (pc->serialization);
+  GNUNET_free (pc->nid);
+  GNUNET_free (pc->nuid);
+  GNUNET_free (pc->serialization);
   if (NULL != pc->dsh)
   {
     GNUNET_DATASTORE_disconnect (pc->dsh, GNUNET_NO);
@@ -650,7 +650,7 @@ publish_content (struct GNUNET_FS_PublishContext *pc)
                                           dirpos->data.file.file_size, raw_data,
                                           &emsg))
             {
-              GNUNET_free_non_null (emsg);
+              GNUNET_free (emsg);
               GNUNET_free (raw_data);
               raw_data = NULL;
             }
@@ -660,10 +660,10 @@ publish_content (struct GNUNET_FS_PublishContext *pc)
         }
         GNUNET_FS_directory_builder_add (db, dirpos->chk_uri, dirpos->meta,
                                          raw_data);
-        GNUNET_free_non_null (raw_data);
+        GNUNET_free (raw_data);
         dirpos = dirpos->next;
       }
-      GNUNET_free_non_null (p->data.dir.dir_data);
+      GNUNET_free (p->data.dir.dir_data);
       p->data.dir.dir_data = NULL;
       p->data.dir.dir_size = 0;
       GNUNET_FS_directory_builder_finish (db, &p->data.dir.dir_size,
@@ -1281,7 +1281,7 @@ suspend_operation (struct GNUNET_FS_FileInformation *fi,
   }
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Suspending publish operation\n");
-  GNUNET_free_non_null (fi->serialization);
+  GNUNET_free (fi->serialization);
   fi->serialization = NULL;
   off = (NULL == fi->chk_uri) ? 0 : (GNUNET_YES == fi->is_directory) ?
         fi->data.dir.dir_size : fi->data.file.file_size;
diff --git a/src/fs/fs_search.c b/src/fs/fs_search.c
index 8e2d7deba..3dbee43ef 100644
--- a/src/fs/fs_search.c
+++ b/src/fs/fs_search.c
@@ -830,7 +830,7 @@ process_kblock (struct GNUNET_FS_SearchContext *sc,
                   &pt[1],
                   emsg);
     }
-    GNUNET_free_non_null (emsg);
+    GNUNET_free (emsg);
     return;
   }
   j = eos - pt + 1;
@@ -900,7 +900,7 @@ process_sblock (struct GNUNET_FS_SearchContext *sc,
                 _ ("Failed to parse URI `%s': %s\n"),
                 uris, emsg);
     GNUNET_break_op (0);        /* ublock malformed */
-    GNUNET_free_non_null (emsg);
+    GNUNET_free (emsg);
     GNUNET_CONTAINER_meta_data_destroy (meta);
     return;
   }
@@ -1548,10 +1548,10 @@ search_result_suspend (void *cls,
     sr->client_info = GNUNET_FS_search_make_status_ (&pi, sc->h, sc);
   }
   GNUNET_break (NULL == sr->client_info);
-  GNUNET_free_non_null (sr->serialization);
+  GNUNET_free (sr->serialization);
   GNUNET_FS_uri_destroy (sr->uri);
   GNUNET_CONTAINER_meta_data_destroy (sr->meta);
-  GNUNET_free_non_null (sr->keyword_bitmap);
+  GNUNET_free (sr->keyword_bitmap);
   GNUNET_free (sr);
   return GNUNET_OK;
 }
@@ -1596,10 +1596,10 @@ GNUNET_FS_search_signal_suspend_ (void *cls)
       GNUNET_free (sc->requests[i].keyword);
     }
   }
-  GNUNET_free_non_null (sc->requests);
-  GNUNET_free_non_null (sc->emsg);
+  GNUNET_free (sc->requests);
+  GNUNET_free (sc->emsg);
   GNUNET_FS_uri_destroy (sc->uri);
-  GNUNET_free_non_null (sc->serialization);
+  GNUNET_free (sc->serialization);
   GNUNET_free (sc);
 }
 
@@ -1760,10 +1760,10 @@ search_result_free (void *cls,
   GNUNET_break (NULL == sr->probe_ctx);
   GNUNET_break (NULL == sr->probe_cancel_task);
   GNUNET_break (NULL == sr->client_info);
-  GNUNET_free_non_null (sr->serialization);
+  GNUNET_free (sr->serialization);
   GNUNET_FS_uri_destroy (sr->uri);
   GNUNET_CONTAINER_meta_data_destroy (sr->meta);
-  GNUNET_free_non_null (sr->keyword_bitmap);
+  GNUNET_free (sr->keyword_bitmap);
   GNUNET_free (sr);
   return GNUNET_OK;
 }
@@ -1825,8 +1825,8 @@ GNUNET_FS_search_stop (struct GNUNET_FS_SearchContext *sc)
     for (i = 0; i < sc->uri->data.ksk.keywordCount; i++)
       GNUNET_CONTAINER_multihashmap_destroy (sc->requests[i].results);
   }
-  GNUNET_free_non_null (sc->requests);
-  GNUNET_free_non_null (sc->emsg);
+  GNUNET_free (sc->requests);
+  GNUNET_free (sc->emsg);
   GNUNET_FS_uri_destroy (sc->uri);
   GNUNET_free (sc);
 }
diff --git a/src/fs/fs_sharetree.c b/src/fs/fs_sharetree.c
index e291938b5..ac850076d 100644
--- a/src/fs/fs_sharetree.c
+++ b/src/fs/fs_sharetree.c
@@ -447,8 +447,8 @@ GNUNET_FS_share_tree_free (struct GNUNET_FS_ShareTreeItem *toplevel)
     GNUNET_CONTAINER_meta_data_destroy (toplevel->meta);
   if (NULL != toplevel->ksk_uri)
     GNUNET_FS_uri_destroy (toplevel->ksk_uri);
-  GNUNET_free_non_null (toplevel->filename);
-  GNUNET_free_non_null (toplevel->short_filename);
+  GNUNET_free (toplevel->filename);
+  GNUNET_free (toplevel->short_filename);
   GNUNET_free (toplevel);
 }
 
diff --git a/src/fs/fs_test_lib.c b/src/fs/fs_test_lib.c
index a0fe336df..dc4b214d9 100644
--- a/src/fs/fs_test_lib.c
+++ b/src/fs/fs_test_lib.c
@@ -195,7 +195,7 @@ report_uri (void *cls)
   if ((GNUNET_YES != po->do_index) &&
       (NULL != po->publish_tmp_file))
     (void) GNUNET_DISK_directory_remove (po->publish_tmp_file);
-  GNUNET_free_non_null (po->publish_tmp_file);
+  GNUNET_free (po->publish_tmp_file);
   GNUNET_free (po);
 }
 
@@ -217,7 +217,7 @@ publish_timeout (void *cls)
   GNUNET_FS_publish_stop (po->publish_context);
   po->publish_cont (po->publish_cont_cls, NULL, NULL);
   (void) GNUNET_DISK_directory_remove (po->publish_tmp_file);
-  GNUNET_free_non_null (po->publish_tmp_file);
+  GNUNET_free (po->publish_tmp_file);
   GNUNET_free (po);
 }
 
diff --git a/src/fs/fs_tree.c b/src/fs/fs_tree.c
index e7f922823..6203690d2 100644
--- a/src/fs/fs_tree.c
+++ b/src/fs/fs_tree.c
@@ -454,7 +454,7 @@ GNUNET_FS_tree_encoder_finish (struct GNUNET_FS_TreeEncoder *te,
   if (emsg != NULL)
     *emsg = te->emsg;
   else
-    GNUNET_free_non_null (te->emsg);
+    GNUNET_free (te->emsg);
   GNUNET_free (te->chk_tree);
   GNUNET_free (te);
 }
diff --git a/src/fs/fs_unindex.c b/src/fs/fs_unindex.c
index f2315d7d0..8c27af9de 100644
--- a/src/fs/fs_unindex.c
+++ b/src/fs/fs_unindex.c
@@ -415,7 +415,7 @@ GNUNET_FS_unindex_do_extract_keywords_ (struct GNUNET_FS_UnindexContext *uc)
                                               GNUNET_NO, ex,
                                               &unindex_directory_scan_cb,
                                               uc);
-  GNUNET_free_non_null (ex);
+  GNUNET_free (ex);
 }
 
 
@@ -777,8 +777,8 @@ GNUNET_FS_unindex_signal_suspend_ (void *cls)
                                    UNINDEX_STATE_COMPLETE) ? uc->file_size : 0);
   GNUNET_break (NULL == uc->client_info);
   GNUNET_free (uc->filename);
-  GNUNET_free_non_null (uc->serialization);
-  GNUNET_free_non_null (uc->emsg);
+  GNUNET_free (uc->serialization);
+  GNUNET_free (uc->emsg);
   GNUNET_free (uc);
 }
 
@@ -892,7 +892,7 @@ GNUNET_FS_unindex_stop (struct GNUNET_FS_UnindexContext *uc)
                                   (uc->state ==
                                    UNINDEX_STATE_COMPLETE) ? uc->file_size : 0);
   GNUNET_break (NULL == uc->client_info);
-  GNUNET_free_non_null (uc->emsg);
+  GNUNET_free (uc->emsg);
   GNUNET_free (uc->filename);
   GNUNET_free (uc);
 }
diff --git a/src/fs/fs_uri.c b/src/fs/fs_uri.c
index 410f3c815..9c430ad9d 100644
--- a/src/fs/fs_uri.c
+++ b/src/fs/fs_uri.c
@@ -353,7 +353,7 @@ uri_ksk_parse (const char *s, char **emsg)
   return ret;
 CLEANUP:
   for (i = 0; i < max; i++)
-    GNUNET_free_non_null (keywords[i]);
+    GNUNET_free (keywords[i]);
   GNUNET_free (keywords);
   GNUNET_free (dup);
   return NULL;
@@ -1172,7 +1172,7 @@ GNUNET_FS_uri_ksk_create_from_args (unsigned int argc, const char **argv)
                      strlen (GNUNET_FS_URI_PREFIX))) &&
       (NULL != (uri = GNUNET_FS_uri_parse (argv[0], &emsg))))
     return uri;
-  GNUNET_free_non_null (emsg);
+  GNUNET_free (emsg);
   uri = GNUNET_new (struct GNUNET_FS_Uri);
   uri->type = GNUNET_FS_URI_KSK;
   uri->data.ksk.keywordCount = argc;
@@ -1825,7 +1825,7 @@ GNUNET_FS_uri_ksk_create_from_meta_data (
                                 ret->data.ksk.keywords,
                                 ret->data.ksk.keywordCount);
   if (ent > 0)
-    GNUNET_free_non_null (full_name);
+    GNUNET_free (full_name);
   return ret;
 }
 
diff --git a/src/fs/gnunet-auto-share.c b/src/fs/gnunet-auto-share.c
index 3aed0268b..f91e9d00d 100644
--- a/src/fs/gnunet-auto-share.c
+++ b/src/fs/gnunet-auto-share.c
@@ -201,9 +201,9 @@ load_state ()
   while (n-- > 0)
   {
     struct GNUNET_BIO_ReadSpec rs[] = {
-      GNUNET_BIO_read_spec_string("filename", &fn, 1024),
-      GNUNET_BIO_read_spec_object("id", &id, sizeof(struct GNUNET_HashCode)),
-      GNUNET_BIO_read_spec_end(),
+      GNUNET_BIO_read_spec_string ("filename", &fn, 1024),
+      GNUNET_BIO_read_spec_object ("id", &id, sizeof(struct GNUNET_HashCode)),
+      GNUNET_BIO_read_spec_end (),
     };
     if (GNUNET_OK != GNUNET_BIO_read_spec_commit (rh, rs))
       goto error;
@@ -227,13 +227,13 @@ load_state ()
     return;
   rh = NULL;
 error:
-  GNUNET_free_non_null (fn);
+  GNUNET_free (fn);
   if (NULL != rh)
     (void) GNUNET_BIO_read_close (rh, &emsg);
   GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
               _ ("Failed to load state: %s\n"),
               emsg);
-  GNUNET_free_non_null (emsg);
+  GNUNET_free (emsg);
 }
 
 
@@ -258,7 +258,8 @@ write_item (void *cls, const struct GNUNET_HashCode *key, void *value)
   struct GNUNET_BIO_WriteSpec ws[] = {
     GNUNET_BIO_write_spec_string ("auto-share-write-item-filename",
                                   wi->filename),
-    GNUNET_BIO_write_spec_object ("id", &wi->id, sizeof(struct GNUNET_HashCode)),
+    GNUNET_BIO_write_spec_object ("id", &wi->id, sizeof(struct
+                                                        GNUNET_HashCode)),
     GNUNET_BIO_write_spec_end (),
   };
   if (GNUNET_OK != GNUNET_BIO_write_spec_commit (wh, ws))
@@ -478,8 +479,7 @@ work (void *cls)
   argv[argc] = NULL;
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, _ ("Publishing `%s'\n"), wi->filename);
   GNUNET_assert (NULL == publish_proc);
-  publish_proc = GNUNET_OS_start_process_vap (GNUNET_YES,
-                                              0,
+  publish_proc = GNUNET_OS_start_process_vap (GNUNET_OS_USE_PIPE_CONTROL,
                                               NULL,
                                               NULL,
                                               NULL,
@@ -748,7 +748,7 @@ main (int argc, char *const *argv)
 
   if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
     return 2;
-  sigpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, GNUNET_NO, GNUNET_NO);
+  sigpipe = GNUNET_DISK_pipe (GNUNET_DISK_PF_NONE);
   GNUNET_assert (NULL != sigpipe);
   shc_chld =
     GNUNET_SIGNAL_handler_install (GNUNET_SIGCHLD, &sighandler_child_death);
@@ -781,7 +781,7 @@ main (int argc, char *const *argv)
   shc_chld = NULL;
   GNUNET_DISK_pipe_close (sigpipe);
   sigpipe = NULL;
-  GNUNET_free_non_null (cfg_filename);
+  GNUNET_free (cfg_filename);
   cfg_filename = NULL;
   GNUNET_free_nz ((void *) argv);
   return ok;
diff --git a/src/fs/gnunet-directory.c b/src/fs/gnunet-directory.c
index 10a09f73b..ef5c40ae2 100644
--- a/src/fs/gnunet-directory.c
+++ b/src/fs/gnunet-directory.c
@@ -106,7 +106,7 @@ print_entry (void *cls,
     GNUNET_CONTAINER_meta_data_iterate (meta, &item_printer, NULL);
     printf ("\n");
     printf (_ ("Directory `%s' contents:\n"), name ? name : "");
-    GNUNET_free_non_null (name);
+    GNUNET_free (name);
     return;
   }
   string = GNUNET_FS_uri_to_string (uri);
@@ -114,7 +114,7 @@ print_entry (void *cls,
   GNUNET_free (string);
   GNUNET_CONTAINER_meta_data_iterate (meta, &item_printer, NULL);
   printf ("\n");
-  GNUNET_free_non_null (name);
+  GNUNET_free (name);
 }
 
 
diff --git a/src/fs/gnunet-publish.c b/src/fs/gnunet-publish.c
index b10e6163c..91fcd8f8a 100644
--- a/src/fs/gnunet-publish.c
+++ b/src/fs/gnunet-publish.c
@@ -729,7 +729,7 @@ identity_continuation (const char *args0)
              _ ("Failed to access `%s': %s\n"),
              args0,
              strerror (errno));
-    GNUNET_free_non_null (ex);
+    GNUNET_free (ex);
     return;
   }
   ds = GNUNET_FS_directory_scan_start (args0,
@@ -744,10 +744,10 @@ identity_continuation (const char *args0)
       "%s",
       _ (
         "Failed to start meta directory scanner.  Is gnunet-helper-publish-fs installed?\n"));
-    GNUNET_free_non_null (ex);
+    GNUNET_free (ex);
     return;
   }
-  GNUNET_free_non_null (ex);
+  GNUNET_free (ex);
 }
 
 
diff --git a/src/fs/gnunet-search.c b/src/fs/gnunet-search.c
index 098633379..d25ae55e6 100644
--- a/src/fs/gnunet-search.c
+++ b/src/fs/gnunet-search.c
@@ -127,7 +127,7 @@ clean_task (void *cls)
              _ ("Failed to write directory with search results to `%s'\n"),
              output_filename);
   }
-  GNUNET_free_non_null (ddata);
+  GNUNET_free (ddata);
   GNUNET_free (output_filename);
 }
 
@@ -197,7 +197,7 @@ progress_cb (void *cls, const struct GNUNET_FS_ProgressInfo *info)
                                           NULL);
     printf ("\n");
     fflush (stdout);
-    GNUNET_free_non_null (filename);
+    GNUNET_free (filename);
     GNUNET_free (uri);
     results++;
     if ((results_limit > 0) && (results >= results_limit))
diff --git a/src/fs/gnunet-service-fs_pr.c b/src/fs/gnunet-service-fs_pr.c
index 71de5668b..150dd72e2 100644
--- a/src/fs/gnunet-service-fs_pr.c
+++ b/src/fs/gnunet-service-fs_pr.c
@@ -588,7 +588,7 @@ GSF_pending_request_get_message_ (struct GSF_PendingRequest *pr)
   if (NULL != pr->public_data.target)
     ext[k++] = *pr->public_data.target;
   GNUNET_memcpy (&ext[k], bf_data, bf_size);
-  GNUNET_free_non_null (bf_data);
+  GNUNET_free (bf_data);
   return env;
 }
 
@@ -622,7 +622,7 @@ clean_request (void *cls, const struct GNUNET_HashCode *key, void *value)
     cont (pr->llc_cont_cls, pr, pr->local_result);
   }
   GSF_plan_notify_request_done_ (pr);
-  GNUNET_free_non_null (pr->replies_seen);
+  GNUNET_free (pr->replies_seen);
   GNUNET_BLOCK_group_destroy (pr->bg);
   pr->bg = NULL;
   GNUNET_PEER_change_rc (pr->sender_pid, -1);
diff --git a/src/fs/test_fs_file_information.c b/src/fs/test_fs_file_information.c
index 391b667cb..9305471d6 100644
--- a/src/fs/test_fs_file_information.c
+++ b/src/fs/test_fs_file_information.c
@@ -129,8 +129,8 @@ run (void *cls, char *const *args, const char *cfgfile,
   GNUNET_FS_file_information_destroy (fidir, &mycleaner, NULL);
   GNUNET_DISK_directory_remove (fn1);
   GNUNET_DISK_directory_remove (fn2);
-  GNUNET_free_non_null (fn1);
-  GNUNET_free_non_null (fn2);
+  GNUNET_free (fn1);
+  GNUNET_free (fn2);
   GNUNET_FS_stop (fs);
 }
 
diff --git a/src/fs/test_fs_namespace.c b/src/fs/test_fs_namespace.c
index 484884243..c1e10d575 100644
--- a/src/fs/test_fs_namespace.c
+++ b/src/fs/test_fs_namespace.c
@@ -190,7 +190,7 @@ publish_cont (void *cls, const struct GNUNET_FS_Uri *ksk_uri, const char *emsg)
     fprintf (stderr, "failed to parse URI `%s': %s\n", sbuf, msg);
     err = 1;
     GNUNET_FS_stop (fs);
-    GNUNET_free_non_null (msg);
+    GNUNET_free (msg);
     return;
   }
   ksk_search =
diff --git a/src/gns/gns_api.c b/src/gns/gns_api.c
index 0d99d822e..bf95bf340 100644
--- a/src/gns/gns_api.c
+++ b/src/gns/gns_api.c
@@ -427,4 +427,5 @@ GNUNET_GNS_lookup (struct GNUNET_GNS_Handle *handle,
                                     proc_cls);
 }
 
+
 /* end of gns_api.c */
diff --git a/src/gns/gns_tld_api.c b/src/gns/gns_tld_api.c
index 1db5baacb..3ebf07db6 100644
--- a/src/gns/gns_tld_api.c
+++ b/src/gns/gns_tld_api.c
@@ -340,7 +340,7 @@ GNUNET_GNS_lookup_with_tld_cancel (struct GNUNET_GNS_LookupWithTldRequest *ltr)
     GNUNET_GNS_lookup_cancel (ltr->lr);
     ltr->lr = NULL;
   }
-  GNUNET_free_non_null (ltr->longest_match);
+  GNUNET_free (ltr->longest_match);
   GNUNET_free (ltr->name);
   GNUNET_free (ltr);
   return ret;
diff --git a/src/gns/gnunet-dns2gns.c b/src/gns/gnunet-dns2gns.c
index 74309f554..0a9b7c861 100644
--- a/src/gns/gnunet-dns2gns.c
+++ b/src/gns/gnunet-dns2gns.c
@@ -190,6 +190,7 @@ do_shutdown (void *cls)
   }
 }
 
+
 /**
  * Shuffle answers
  * Fisher-Yates (aka Knuth) Shuffle
@@ -216,6 +217,7 @@ shuffle_answers (struct Request *request)
   }
 }
 
+
 /**
  * Send the response for the given request and clean up.
  *
diff --git a/src/gns/gnunet-gns-import.c b/src/gns/gnunet-gns-import.c
index 2c7c56411..78db28cab 100644
--- a/src/gns/gnunet-gns-import.c
+++ b/src/gns/gnunet-gns-import.c
@@ -87,8 +87,7 @@ static int ret;
 
 
 static int
-run_process_and_wait (int pipe_control,
-                      enum GNUNET_OS_InheritStdioFlags std_inheritance,
+run_process_and_wait (enum GNUNET_OS_InheritStdioFlags std_inheritance,
                       struct GNUNET_DISK_PipeHandle *pipe_stdin,
                       struct GNUNET_DISK_PipeHandle *pipe_stdout,
                       enum GNUNET_OS_ProcessStatusType *st,
@@ -120,7 +119,7 @@ run_process_and_wait (int pipe_control,
   va_end (apc2);
   if (arglen > 0)
     argp[-1] = '\0';
-  p = GNUNET_OS_start_process_va (pipe_control, std_inheritance,
+  p = GNUNET_OS_start_process_va (std_inheritance,
                                   pipe_stdin,
                                   pipe_stdout,
                                   NULL,
@@ -222,7 +221,7 @@ zone_iteration_error (void *cls)
 
   if (! found_private_rec)
   {
-    if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+    if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                    NULL, NULL, &st, &code,
                                    "gnunet-namestore",
                                    "gnunet-namestore", "-z", "master-zone",
@@ -236,7 +235,7 @@ zone_iteration_error (void *cls)
   }
   if (! found_pin_rec)
   {
-    if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+    if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                    NULL, NULL, &st, &code,
                                    "gnunet-namestore",
                                    "gnunet-namestore", "-z", "master-zone",
@@ -346,9 +345,9 @@ get_ego (void *cls,
 static void
 shutdown_task (void *cls)
 {
-  GNUNET_free_non_null (master_zone_pkey);
+  GNUNET_free (master_zone_pkey);
   master_zone_pkey = NULL;
-  GNUNET_free_non_null (private_zone_pkey);
+  GNUNET_free (private_zone_pkey);
   private_zone_pkey = NULL;
   if (NULL != list_it)
   {
@@ -385,7 +384,8 @@ run (void *cls, char *const *args, const char *cfgfile,
 
   cfg = c;
 
-  if (0 != run_process_and_wait (GNUNET_NO, 0, NULL, NULL, &st, &code,
+  if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_NONE,
+                                 NULL, NULL, &st, &code,
                                  "gnunet-arm",
                                  "gnunet-arm", "-I", NULL))
   {
@@ -395,60 +395,60 @@ run (void *cls, char *const *args, const char *cfgfile,
     return;
   }
 
-  if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+  if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                  NULL, NULL, &st, &code,
                                  "gnunet-identity",
                                  "gnunet-identity", "-C", "master-zone", NULL))
     return;
 
-  if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+  if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                  NULL, NULL, &st, &code,
                                  "gnunet-identity",
                                  "gnunet-identity", "-C", "private-zone", NULL))
     return;
 
-  if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+  if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                  NULL, NULL, &st, &code,
                                  "gnunet-identity",
                                  "gnunet-identity", "-C", "sks-zone", NULL))
     return;
 
-  if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+  if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                  NULL, NULL, &st, &code,
                                  "gnunet-identity",
                                  "gnunet-identity", "-e", "master-zone", "-s",
                                  "gns-master", NULL))
     return;
 
-  if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+  if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                  NULL, NULL, &st, &code,
                                  "gnunet-identity",
                                  "gnunet-identity", "-e", "master-zone", "-s",
                                  "namestore", NULL))
     return;
 
-  if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+  if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                  NULL, NULL, &st, &code,
                                  "gnunet-identity",
                                  "gnunet-identity", "-e", "master-zone", "-s",
                                  "gns-proxy", NULL))
     return;
 
-  if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+  if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                  NULL, NULL, &st, &code,
                                  "gnunet-identity",
                                  "gnunet-identity", "-e", "master-zone", "-s",
                                  "gns-intercept", NULL))
     return;
 
-  if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+  if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                  NULL, NULL, &st, &code,
                                  "gnunet-identity",
                                  "gnunet-identity", "-e", "private-zone", "-s",
                                  "gns-private", NULL))
     return;
 
-  if (0 != run_process_and_wait (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+  if (0 != run_process_and_wait (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                  NULL, NULL, &st, &code,
                                  "gnunet-identity",
                                  "gnunet-identity", "-e", "sks-zone", "-s",
diff --git a/src/gns/gnunet-gns-proxy.c b/src/gns/gnunet-gns-proxy.c
index eb6c6852e..d38204ef1 100644
--- a/src/gns/gnunet-gns-proxy.c
+++ b/src/gns/gnunet-gns-proxy.c
@@ -831,9 +831,9 @@ cleanup_s5r (struct Socks5Request *s5r)
   GNUNET_CONTAINER_DLL_remove (s5r_head,
                                s5r_tail,
                                s5r);
-  GNUNET_free_non_null (s5r->domain);
-  GNUNET_free_non_null (s5r->leho);
-  GNUNET_free_non_null (s5r->url);
+  GNUNET_free (s5r->domain);
+  GNUNET_free (s5r->leho);
+  GNUNET_free (s5r->url);
   for (unsigned int i = 0; i < s5r->num_danes; i++)
     GNUNET_free (s5r->dane_data[i]);
   GNUNET_free (s5r);
@@ -1311,8 +1311,8 @@ curl_check_hdr (void *buffer,
   }
 cleanup:
   GNUNET_free (ndup);
-  GNUNET_free_non_null (new_cookie_hdr);
-  GNUNET_free_non_null (new_location);
+  GNUNET_free (new_cookie_hdr);
+  GNUNET_free (new_location);
   return bytes;
 }
 
@@ -2446,14 +2446,14 @@ kill_httpd (struct MhdHttpList *hd)
   GNUNET_CONTAINER_DLL_remove (mhd_httpd_head,
                                mhd_httpd_tail,
                                hd);
-  GNUNET_free_non_null (hd->domain);
+  GNUNET_free (hd->domain);
   MHD_stop_daemon (hd->daemon);
   if (NULL != hd->httpd_task)
   {
     GNUNET_SCHEDULER_cancel (hd->httpd_task);
     hd->httpd_task = NULL;
   }
-  GNUNET_free_non_null (hd->proxy_cert);
+  GNUNET_free (hd->proxy_cert);
   if (hd == httpd)
     httpd = NULL;
   GNUNET_free (hd);
@@ -2657,7 +2657,7 @@ load_key_from_file (gnutls_x509_privkey_t key,
                 _ ("Unable to import private key from file `%s'\n"),
                 keyfile);
   }
-  GNUNET_free_non_null (key_data.data);
+  GNUNET_free (key_data.data);
   return (GNUTLS_E_SUCCESS != ret) ? GNUNET_SYSERR : GNUNET_OK;
 }
 
@@ -2689,7 +2689,7 @@ load_cert_from_file (gnutls_x509_crt_t crt,
                 _ ("Unable to import certificate from `%s'\n"),
                 certfile);
   }
-  GNUNET_free_non_null (cert_data.data);
+  GNUNET_free (cert_data.data);
   return (GNUTLS_E_SUCCESS != ret) ? GNUNET_SYSERR : GNUNET_OK;
 }
 
@@ -2921,7 +2921,7 @@ setup_data_transfer (struct Socks5Request *s5r)
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
                 _ ("Failed to pass client to MHD\n"));
     cleanup_s5r (s5r);
-    GNUNET_free_non_null (domain);
+    GNUNET_free (domain);
     return;
   }
   s5r->hd = hd;
@@ -2929,7 +2929,7 @@ setup_data_transfer (struct Socks5Request *s5r)
   s5r->timeout_task = GNUNET_SCHEDULER_add_delayed (HTTP_HANDSHAKE_TIMEOUT,
                                                     &timeout_s5r_handshake,
                                                     s5r);
-  GNUNET_free_non_null (domain);
+  GNUNET_free (domain);
 }
 
 
@@ -3145,7 +3145,7 @@ handle_gns_result (void *cls,
       break;
 
     case GNUNET_GNSRECORD_TYPE_LEHO:
-      GNUNET_free_non_null (s5r->leho);
+      GNUNET_free (s5r->leho);
       s5r->leho = GNUNET_strndup (r->data,
                                   r->data_size);
       break;
@@ -3732,10 +3732,10 @@ run (void *cls,
     gnutls_x509_crt_deinit (proxy_ca.cert);
     gnutls_x509_privkey_deinit (proxy_ca.key);
     gnutls_global_deinit ();
-    GNUNET_free_non_null (cafile_cfg);
+    GNUNET_free (cafile_cfg);
     return;
   }
-  GNUNET_free_non_null (cafile_cfg);
+  GNUNET_free (cafile_cfg);
   if (NULL == (gns_handle = GNUNET_GNS_connect (cfg)))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -3900,7 +3900,7 @@ main (int argc,
                          options,
                          &run, NULL)) ? 0 : 1;
   MHD_destroy_response (curl_failure_response);
-  GNUNET_free_non_null ((char *) argv);
+  GNUNET_free_nz ((char *) argv);
   return ret;
 }
 
diff --git a/src/gns/gnunet-service-gns_resolver.c b/src/gns/gnunet-service-gns_resolver.c
index 7d398c168..cb75b23c7 100644
--- a/src/gns/gnunet-service-gns_resolver.c
+++ b/src/gns/gnunet-service-gns_resolver.c
@@ -1675,7 +1675,7 @@ recursive_cname_resolution (struct GNS_ResolverHandle *rh,
       (off != rd->data_size))
   {
     GNUNET_break_op (0);  /* record not well-formed */
-    GNUNET_free_non_null (cname);
+    GNUNET_free (cname);
     fail_resolution (rh);
     return;
   }
@@ -1777,8 +1777,8 @@ recursive_gns2dns_resolution (struct GNS_ResolverHandle *rh,
         (off != rd[i].data_size))
     {
       GNUNET_break_op (0);
-      GNUNET_free_non_null (n);
-      GNUNET_free_non_null (ip);
+      GNUNET_free (n);
+      GNUNET_free (ip);
       continue;
     }
     /* resolve 'ip' to determine the IP(s) of the DNS
@@ -1983,7 +1983,7 @@ handle_gns_resolution_result (void *cls,
           (off != rd[0].data_size))
       {
         GNUNET_break_op (0);
-        GNUNET_free_non_null (cname);
+        GNUNET_free (cname);
         fail_resolution (rh);
         return;
       }
@@ -2137,7 +2137,7 @@ handle_gns_resolution_result (void *cls,
               rd_off++;
             }
           }
-          GNUNET_free_non_null (cname);
+          GNUNET_free (cname);
         }
         break;
 
@@ -2993,7 +2993,7 @@ GNS_resolver_lookup_cancel (struct GNS_ResolverHandle *rh)
                                  dr);
     GNUNET_free (dr);
   }
-  GNUNET_free_non_null (rh->leho);
+  GNUNET_free (rh->leho);
   GNUNET_free (rh->name);
   GNUNET_free (rh);
 }
diff --git a/src/gns/nss/nss_gns.c b/src/gns/nss/nss_gns.c
index 36799ba3a..77b4340ee 100644
--- a/src/gns/nss/nss_gns.c
+++ b/src/gns/nss/nss_gns.c
@@ -38,7 +38,7 @@
 /** macro to align idx to 32bit boundary */
 #define ALIGN(idx) do { \
     if (idx % sizeof(void*)) \
-      idx += (sizeof(void*) - idx % sizeof(void*)); /* Align on 32 bit boundary */ \
+    idx += (sizeof(void*) - idx % sizeof(void*));   /* Align on 32 bit boundary */ \
 } while (0)
 
 
diff --git a/src/gns/nss/nss_gns_query.c b/src/gns/nss/nss_gns_query.c
index 11e46ad7f..96e8e10da 100644
--- a/src/gns/nss/nss_gns_query.c
+++ b/src/gns/nss/nss_gns_query.c
@@ -150,7 +150,7 @@ query_gns:
     if (1 == retry)
       return -2; /* no go -> service unavailable */
     retry = 1;
-    system("gnunet-arm -s");
+    system ("gnunet-arm -s");
     goto query_gns; /* Try again */
   }
   if (3 == WEXITSTATUS (ret))
diff --git a/src/gns/plugin_gnsrecord_gns.c b/src/gns/plugin_gnsrecord_gns.c
index 370bf1da4..81f2b9eff 100644
--- a/src/gns/plugin_gnsrecord_gns.c
+++ b/src/gns/plugin_gnsrecord_gns.c
@@ -75,14 +75,14 @@ gns_value_to_string (void *cls,
       if (NULL == ns)
       {
         GNUNET_break_op (0);
-        GNUNET_free_non_null (ns);
+        GNUNET_free (ns);
         return NULL;
       }
       /* DNS server IP/name must be UTF-8 */
       ip = GNUNET_strdup (&((const char*) data)[off]);
       GNUNET_asprintf (&nstr, "%s@%s", ns, ip);
-      GNUNET_free_non_null (ns);
-      GNUNET_free_non_null (ip);
+      GNUNET_free (ns);
+      GNUNET_free (ip);
       return nstr;
     }
 
diff --git a/src/gns/plugin_rest_gns.c b/src/gns/plugin_rest_gns.c
index feb333350..37313c529 100644
--- a/src/gns/plugin_rest_gns.c
+++ b/src/gns/plugin_rest_gns.c
@@ -461,7 +461,7 @@ libgnunet_plugin_rest_gns_done (void *cls)
 
   plugin->cfg = NULL;
 
-  GNUNET_free_non_null (allow_methods);
+  GNUNET_free (allow_methods);
   GNUNET_free (api);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Gns REST plugin is finished\n");
   return NULL;
diff --git a/src/gns/test_gns_lookup.conf b/src/gns/test_gns_lookup.conf
index 130d190e7..db0b4bfbe 100644
--- a/src/gns/test_gns_lookup.conf
+++ b/src/gns/test_gns_lookup.conf
@@ -23,7 +23,8 @@ DNS_ROOT=PD67SGHF3E0447TU9HADIVU9OM7V4QHTOG0EBU69TFRI2LG63DR0
 #PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=/tmp/ns_log
 
 [revocation]
-WORKBITS = 1
+WORKBITS = 2
+EPOCH_DURATION = 365 d
 
 [dhtcache]
 QUOTA = 1 MB
diff --git a/src/gns/test_gns_proxy.c b/src/gns/test_gns_proxy.c
index 12f3f8625..13764d520 100644
--- a/src/gns/test_gns_proxy.c
+++ b/src/gns/test_gns_proxy.c
@@ -139,7 +139,7 @@ load_key_from_file (gnutls_x509_privkey_t key,
                 _ ("Unable to import private key from file `%s'\n"),
                 keyfile);
   }
-  GNUNET_free_non_null (key_data.data);
+  GNUNET_free (key_data.data);
   return (GNUTLS_E_SUCCESS != ret) ? GNUNET_SYSERR : GNUNET_OK;
 }
 
@@ -171,7 +171,7 @@ load_cert_from_file (gnutls_x509_crt_t crt,
                 _ ("Unable to import certificate from `%s'\n"),
                 certfile);
   }
-  GNUNET_free_non_null (cert_data.data);
+  GNUNET_free (cert_data.data);
   return (GNUTLS_E_SUCCESS != ret) ? GNUNET_SYSERR : GNUNET_OK;
 }
 
@@ -245,7 +245,7 @@ do_shutdown ()
     MHD_stop_daemon (mhd);
     mhd = NULL;
   }
-  GNUNET_free_non_null (url);
+  GNUNET_free (url);
 
   if (NULL != proxy_proc)
   {
@@ -528,6 +528,8 @@ run (void *cls,
 int
 main (int argc, char *const *argv)
 {
+  char *tmp_argv;
+
   struct GNUNET_GETOPT_CommandLineOption options[] = {
     GNUNET_GETOPT_option_uint16 ('p',
                                  "port",
@@ -557,7 +559,7 @@ main (int argc, char *const *argv)
   }
   if (GNUNET_OK !=
       GNUNET_STRINGS_get_utf8_args (argc, argv,
-                                    &argc, &argv))
+                                    &argc, &tmp_argv))
     return 2;
   GNUNET_log_setup ("gnunet-gns-proxy-test",
                     "WARNING",
@@ -568,7 +570,7 @@ main (int argc, char *const *argv)
                                        options,
                                        &run, NULL))
     return 1;
-  GNUNET_free_non_null ((char *) argv);
+  GNUNET_free (tmp_argv);
   return global_ret;
 }
 
diff --git a/src/gnsrecord/gnsrecord.c b/src/gnsrecord/gnsrecord.c
index 82fb71c06..8d5a6d95b 100644
--- a/src/gnsrecord/gnsrecord.c
+++ b/src/gnsrecord/gnsrecord.c
@@ -102,8 +102,15 @@ init ()
   if (1 == once)
     return;
   once = 1;
+  const struct GNUNET_OS_ProjectData *pd = GNUNET_OS_project_data_get ();
+  const struct GNUNET_OS_ProjectData *dpd = GNUNET_OS_project_data_default ();
+
+  if (pd != dpd)
+    GNUNET_OS_init (dpd);
   GNUNET_PLUGIN_load_all ("libgnunet_plugin_gnsrecord_", NULL,
                           &add_plugin, NULL);
+  if (pd != dpd)
+    GNUNET_OS_init (pd);
 }
 
 
@@ -114,6 +121,11 @@ void __attribute__ ((destructor))
 GNSRECORD_fini ()
 {
   struct Plugin *plugin;
+  const struct GNUNET_OS_ProjectData *pd = GNUNET_OS_project_data_get ();
+  const struct GNUNET_OS_ProjectData *dpd = GNUNET_OS_project_data_default ();
+
+  if (pd != dpd)
+    GNUNET_OS_init (dpd);
 
   for (unsigned int i = 0; i < num_plugins; i++)
   {
@@ -124,7 +136,11 @@ GNSRECORD_fini ()
     GNUNET_free (plugin->library_name);
     GNUNET_free (plugin);
   }
-  GNUNET_free_non_null (gns_plugins);
+  GNUNET_free (gns_plugins);
+
+  if (pd != dpd)
+    GNUNET_OS_init (pd);
+
   gns_plugins = NULL;
   once = 0;
   num_plugins = 0;
diff --git a/src/gnsrecord/plugin_gnsrecord_dns.c b/src/gnsrecord/plugin_gnsrecord_dns.c
index 5410d9546..9ac6fb9e6 100644
--- a/src/gnsrecord/plugin_gnsrecord_dns.c
+++ b/src/gnsrecord/plugin_gnsrecord_dns.c
@@ -65,7 +65,7 @@ dns_value_to_string (void *cls,
       if ((NULL == ns) || (off != data_size))
       {
         GNUNET_break_op (0);
-        GNUNET_free_non_null (ns);
+        GNUNET_free (ns);
         return NULL;
       }
       return ns;
@@ -80,7 +80,7 @@ dns_value_to_string (void *cls,
       if ((NULL == cname) || (off != data_size))
       {
         GNUNET_break_op (0);
-        GNUNET_free_non_null (cname);
+        GNUNET_free (cname);
         return NULL;
       }
       return cname;
@@ -121,7 +121,7 @@ dns_value_to_string (void *cls,
       if ((NULL == ptr) || (off != data_size))
       {
         GNUNET_break_op (0);
-        GNUNET_free_non_null (ptr);
+        GNUNET_free (ptr);
         return NULL;
       }
       return ptr;
diff --git a/src/hello/hello-ng.c b/src/hello/hello-ng.c
index d06feadd5..dd3480a48 100644
--- a/src/hello/hello-ng.c
+++ b/src/hello/hello-ng.c
@@ -153,7 +153,7 @@ GNUNET_HELLO_extract_address (const void *raw,
       GNUNET_STRINGS_base64_decode (raws, sc - raws, (void **) &sig))
   {
     GNUNET_break_op (0);
-    GNUNET_free_non_null (sig);
+    GNUNET_free (sig);
     return NULL;
   }
   raw_addr = sc3 + 1;
diff --git a/src/hello/hello.c b/src/hello/hello.c
index 11eec9898..fa859a772 100644
--- a/src/hello/hello.c
+++ b/src/hello/hello.c
@@ -300,7 +300,7 @@ GNUNET_HELLO_iterate_addresses (const struct GNUNET_HELLO_Message *msg,
     if (0 == esize)
     {
       GNUNET_break (0);
-      GNUNET_free_non_null (ret);
+      GNUNET_free (ret);
       return NULL;
     }
     /* need GNUNET_memcpy() due to possibility of misalignment */
diff --git a/src/hostlist/gnunet-daemon-hostlist_client.c b/src/hostlist/gnunet-daemon-hostlist_client.c
index c2e8f5d88..b377f2041 100644
--- a/src/hostlist/gnunet-daemon-hostlist_client.c
+++ b/src/hostlist/gnunet-daemon-hostlist_client.c
@@ -540,12 +540,12 @@ download_get_url ()
   {                                                 \
     ret = curl_easy_setopt (c, a, b);               \
     if (CURLE_OK != ret)                            \
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING,        \
-                  _ ("%s failed at %s:%d: `%s'\n"), \
-                  "curl_easy_setopt",               \
-                  __FILE__,                         \
-                  __LINE__,                         \
-                  curl_easy_strerror (ret));        \
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING,        \
+                _ ("%s failed at %s:%d: `%s'\n"), \
+                "curl_easy_setopt",               \
+                __FILE__,                         \
+                __LINE__,                         \
+                curl_easy_strerror (ret));        \
   } while (0)
 
 
@@ -790,7 +790,7 @@ clean_up ()
     curl_easy_cleanup (curl);
     curl = NULL;
   }
-  GNUNET_free_non_null (current_url);
+  GNUNET_free (current_url);
   current_url = NULL;
   stat_bytes_downloaded = 0;
   stat_download_in_progress = GNUNET_NO;
@@ -1418,11 +1418,12 @@ load_hostlist_file ()
 
   counter = 0;
   struct GNUNET_BIO_ReadSpec rs[] = {
-    GNUNET_BIO_read_spec_int32 ("times used", (int32_t *)&times_used),
+    GNUNET_BIO_read_spec_int32 ("times used", (int32_t *) &times_used),
     GNUNET_BIO_read_spec_int64 ("quality", (int64_t *) &quality),
     GNUNET_BIO_read_spec_int64 ("last used", (int64_t *) &last_used),
     GNUNET_BIO_read_spec_int64 ("created", (int64_t *) &created),
-    GNUNET_BIO_read_spec_int32 ("hellos returned", (int32_t *) &hellos_returned),
+    GNUNET_BIO_read_spec_int32 ("hellos returned",
+                                (int32_t *) &hellos_returned),
     GNUNET_BIO_read_spec_end (),
   };
   while ((GNUNET_OK == GNUNET_BIO_read_string (rh, "url", &uri, MAX_URL_LEN)) &&
@@ -1460,7 +1461,7 @@ load_hostlist_file ()
                          linked_list_size,
                          GNUNET_NO);
 
-  GNUNET_free_non_null (uri);
+  GNUNET_free (uri);
   emsg = NULL;
   (void) GNUNET_BIO_read_close (rh, &emsg);
   if (emsg != NULL)
@@ -1527,7 +1528,8 @@ save_hostlist_file (int shutdown)
     {
       struct GNUNET_BIO_WriteSpec ws[] = {
         GNUNET_BIO_write_spec_string ("hostlist uri", pos->hostlist_uri),
-        GNUNET_BIO_write_spec_int32 ("times used", (int32_t *) &pos->times_used),
+        GNUNET_BIO_write_spec_int32 ("times used",
+                                     (int32_t *) &pos->times_used),
         GNUNET_BIO_write_spec_int64 ("quality", (int64_t *) &pos->quality),
         GNUNET_BIO_write_spec_int64 (
           "last usage",
@@ -1657,15 +1659,15 @@ GNUNET_HOSTLIST_client_start (const struct GNUNET_CONFIGURATION_Handle *c,
         GNUNET_free (proxytype_str);
         GNUNET_free (proxy);
         proxy = NULL;
-        GNUNET_free_non_null (proxy_username);
+        GNUNET_free (proxy_username);
         proxy_username = NULL;
-        GNUNET_free_non_null (proxy_password);
+        GNUNET_free (proxy_password);
         proxy_password = NULL;
 
         return GNUNET_SYSERR;
       }
     }
-    GNUNET_free_non_null (proxytype_str);
+    GNUNET_free (proxytype_str);
   }
 
   stat_learning = learn;
@@ -1786,11 +1788,11 @@ GNUNET_HOSTLIST_client_stop ()
     ti_check_download = NULL;
     curl_global_cleanup ();
   }
-  GNUNET_free_non_null (proxy);
+  GNUNET_free (proxy);
   proxy = NULL;
-  GNUNET_free_non_null (proxy_username);
+  GNUNET_free (proxy_username);
   proxy_username = NULL;
-  GNUNET_free_non_null (proxy_password);
+  GNUNET_free (proxy_password);
   proxy_password = NULL;
   if (NULL != pi)
   {
diff --git a/src/hostlist/gnunet-daemon-hostlist_server.c b/src/hostlist/gnunet-daemon-hostlist_server.c
index 999730e3e..b6c0495c0 100644
--- a/src/hostlist/gnunet-daemon-hostlist_server.c
+++ b/src/hostlist/gnunet-daemon-hostlist_server.c
@@ -229,7 +229,7 @@ host_processor (void *cls,
   {
     GNUNET_assert (NULL == peer);
     builder->pitr = NULL;
-    GNUNET_free_non_null (builder->data);
+    GNUNET_free (builder->data);
     GNUNET_free (builder);
     builder = NULL;
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
@@ -534,7 +534,7 @@ process_notify (void *cls,
       GNUNET_PEERINFO_iterate_cancel (builder->pitr);
       builder->pitr = NULL;
     }
-    GNUNET_free_non_null (builder->data);
+    GNUNET_free (builder->data);
     builder->size = 0;
     builder->data = NULL;
   }
@@ -886,7 +886,7 @@ GNUNET_HOSTLIST_server_stop ()
       GNUNET_PEERINFO_iterate_cancel (builder->pitr);
       builder->pitr = NULL;
     }
-    GNUNET_free_non_null (builder->data);
+    GNUNET_free (builder->data);
     GNUNET_free (builder);
     builder = NULL;
   }
diff --git a/src/hostlist/test_gnunet_daemon_hostlist.c b/src/hostlist/test_gnunet_daemon_hostlist.c
index d10924eac..063db2f99 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist.c
@@ -136,8 +136,8 @@ setup_peer (struct PeerContext *p, const char *cfgname)
 
   binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm");
   p->cfg = GNUNET_CONFIGURATION_create ();
-  p->arm_proc = GNUNET_OS_start_process (GNUNET_YES,
-                                         GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+  p->arm_proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR
+                                         | GNUNET_OS_USE_PIPE_CONTROL,
                                          NULL,
                                          NULL,
                                          NULL,
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_learning.c b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
index a45721521..a0656f770 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_learning.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist_learning.c
@@ -390,7 +390,7 @@ handle_ad_arrive (void *cls,
                 expected_uri,
                 current_adv_uri);
   GNUNET_free (expected_uri);
-  GNUNET_free_non_null (hostname);
+  GNUNET_free (hostname);
 }
 
 
@@ -412,7 +412,8 @@ setup_learn_peer (struct PeerContext *p,
   binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm");
   p->cfg = GNUNET_CONFIGURATION_create ();
   p->arm_proc =
-    GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+    GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR
+                             | GNUNET_OS_USE_PIPE_CONTROL,
                              NULL, NULL, NULL,
                              binary,
                              "gnunet-service-arm",
@@ -459,8 +460,8 @@ setup_adv_peer (struct PeerContext *p,
   binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm");
   p->cfg = GNUNET_CONFIGURATION_create ();
   p->arm_proc =
-    GNUNET_OS_start_process (GNUNET_YES,
-                             GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+    GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR
+                             | GNUNET_OS_USE_PIPE_CONTROL,
                              NULL, NULL, NULL,
                              binary,
                              "gnunet-service-arm",
diff --git a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
index 657b85fd8..321f96f3d 100644
--- a/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
+++ b/src/hostlist/test_gnunet_daemon_hostlist_reconnect.c
@@ -105,8 +105,8 @@ setup_peer (struct PeerContext *p, const char *cfgname)
 
   binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-arm");
   p->cfg = GNUNET_CONFIGURATION_create ();
-  p->arm_proc = GNUNET_OS_start_process (GNUNET_YES,
-                                         GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+  p->arm_proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR
+                                         | GNUNET_OS_USE_PIPE_CONTROL,
                                          NULL,
                                          NULL,
                                          NULL,
diff --git a/src/identity/gnunet-identity.c b/src/identity/gnunet-identity.c
index cf44afd1f..d0f5546f3 100644
--- a/src/identity/gnunet-identity.c
+++ b/src/identity/gnunet-identity.c
@@ -406,7 +406,8 @@ run (void *cls,
       GNUNET_STRINGS_string_to_data (privkey_ego,
                                      strlen (privkey_ego),
                                      &pk,
-                                     sizeof(struct GNUNET_CRYPTO_EcdsaPrivateKey));
+                                     sizeof(struct
+                                            GNUNET_CRYPTO_EcdsaPrivateKey));
       create_op =
         GNUNET_IDENTITY_create (sh,
                                 create_ego,
@@ -452,7 +453,8 @@ main (int argc, char *const *argv)
     GNUNET_GETOPT_option_string ('P',
                                  "privkey",
                                  "PRIVATE_KEY",
-                                 gettext_noop ("set the private key for the identity to PRIVATE_KEY (use together with -C)"),
+                                 gettext_noop (
+                                   "set the private key for the identity to PRIVATE_KEY (use together with -C)"),
                                  &privkey_ego),
     GNUNET_GETOPT_option_flag ('d',
                                "display",
diff --git a/src/identity/identity_api.c b/src/identity/identity_api.c
index 5d17ac5d5..f7aca1655 100644
--- a/src/identity/identity_api.c
+++ b/src/identity/identity_api.c
@@ -150,9 +150,9 @@ struct GNUNET_IDENTITY_Handle
 /**
  * Obtain the ego representing 'anonymous' users.
  *
- * @return handle for the anonymous user, must not be freed
+ * @return handle for the anonymous user, MUST NOT be freed
  */
-const struct GNUNET_IDENTITY_Ego *
+struct GNUNET_IDENTITY_Ego *
 GNUNET_IDENTITY_ego_get_anonymous ()
 {
   static struct GNUNET_IDENTITY_Ego anon;
diff --git a/src/identity/plugin_rest_identity.c b/src/identity/plugin_rest_identity.c
index 009a01f16..02e42d03f 100644
--- a/src/identity/plugin_rest_identity.c
+++ b/src/identity/plugin_rest_identity.c
@@ -1065,7 +1065,8 @@ ego_create (struct GNUNET_REST_RequestHandle *con_handle,
     GNUNET_STRINGS_string_to_data (privkey,
                                    strlen (privkey),
                                    &pk,
-                                   sizeof(struct GNUNET_CRYPTO_EcdsaPrivateKey));
+                                   sizeof(struct
+                                          GNUNET_CRYPTO_EcdsaPrivateKey));
     pk_ptr = &pk;
   }
   else
@@ -1422,7 +1423,7 @@ libgnunet_plugin_rest_identity_done (void *cls)
 
   plugin->cfg = NULL;
 
-  GNUNET_free_non_null (allow_methods);
+  GNUNET_free (allow_methods);
   GNUNET_free (api);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Identity REST plugin is finished\n");
   return NULL;
diff --git a/src/include/gnunet_bio_lib.h b/src/include/gnunet_bio_lib.h
index 687334c1c..e49ce1354 100644
--- a/src/include/gnunet_bio_lib.h
+++ b/src/include/gnunet_bio_lib.h
@@ -138,9 +138,9 @@ GNUNET_BIO_read_meta_data (struct GNUNET_BIO_ReadHandle *h,
  * @param f address of float to read
  */
 int
-GNUNET_BIO_read_float(struct GNUNET_BIO_ReadHandle *h,
-                      const char *what,
-                      float *f);
+GNUNET_BIO_read_float (struct GNUNET_BIO_ReadHandle *h,
+                       const char *what,
+                       float *f);
 
 
 /**
@@ -151,10 +151,9 @@ GNUNET_BIO_read_float(struct GNUNET_BIO_ReadHandle *h,
  * @param f address of double to read
  */
 int
-GNUNET_BIO_read_double(struct GNUNET_BIO_ReadHandle *h,
-                       const char *what,
-                       double *f);
-
+GNUNET_BIO_read_double (struct GNUNET_BIO_ReadHandle *h,
+                        const char *what,
+                        double *f);
 
 
 /**
@@ -171,7 +170,6 @@ GNUNET_BIO_read_int32 (struct GNUNET_BIO_ReadHandle *h,
                        int32_t *i);
 
 
-
 /**
  * Read an (u)int64_t.
  *
@@ -186,7 +184,6 @@ GNUNET_BIO_read_int64 (struct GNUNET_BIO_ReadHandle *h,
                        int64_t *i);
 
 
-
 /****************************** WRITING API *******************************/
 
 /**
@@ -310,9 +307,9 @@ GNUNET_BIO_write_meta_data (struct GNUNET_BIO_WriteHandle *h,
  * @param f float to write (must be a variable)
  */
 int
-GNUNET_BIO_write_float(struct GNUNET_BIO_WriteHandle *h,
-                       const char *what,
-                       float f);
+GNUNET_BIO_write_float (struct GNUNET_BIO_WriteHandle *h,
+                        const char *what,
+                        float f);
 
 /**
  * Write a double.
@@ -322,9 +319,9 @@ GNUNET_BIO_write_float(struct GNUNET_BIO_WriteHandle *h,
  * @param f double to write (must be a variable)
  */
 int
-GNUNET_BIO_write_double(struct GNUNET_BIO_WriteHandle *h,
-                        const char *what,
-                        double f);
+GNUNET_BIO_write_double (struct GNUNET_BIO_WriteHandle *h,
+                         const char *what,
+                         double f);
 
 
 /**
@@ -490,7 +487,7 @@ GNUNET_BIO_read_spec_int64 (const char *what,
  * @param f address of float to read
  */
 struct GNUNET_BIO_ReadSpec
-GNUNET_BIO_read_spec_float(const char *what, float *f);
+GNUNET_BIO_read_spec_float (const char *what, float *f);
 
 
 /**
@@ -500,7 +497,7 @@ GNUNET_BIO_read_spec_float(const char *what, float *f);
  * @param f address of double to read
  */
 struct GNUNET_BIO_ReadSpec
-GNUNET_BIO_read_spec_double(const char *what, double *f);
+GNUNET_BIO_read_spec_double (const char *what, double *f);
 
 
 /**
@@ -647,7 +644,7 @@ GNUNET_BIO_write_spec_int64 (const char *what,
  * @return the write spec
  */
 struct GNUNET_BIO_WriteSpec
-GNUNET_BIO_write_spec_float(const char *what, float *f);
+GNUNET_BIO_write_spec_float (const char *what, float *f);
 
 
 /**
@@ -658,7 +655,7 @@ GNUNET_BIO_write_spec_float(const char *what, float *f);
  * @return the write spec
  */
 struct GNUNET_BIO_WriteSpec
-GNUNET_BIO_write_spec_double(const char *what, double *f);
+GNUNET_BIO_write_spec_double (const char *what, double *f);
 
 
 /**
diff --git a/src/include/gnunet_buffer_lib.h b/src/include/gnunet_buffer_lib.h
index e23536ab2..e09ec130a 100644
--- a/src/include/gnunet_buffer_lib.h
+++ b/src/include/gnunet_buffer_lib.h
@@ -147,7 +147,7 @@ GNUNET_buffer_write_fstr (struct GNUNET_Buffer *buf, const char *fmt, ...);
  */
 void
 GNUNET_buffer_write_vfstr (struct GNUNET_Buffer *buf, const char *fmt, va_list
-                          args);
+                           args);
 
 
 /**
diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index 34f419a49..91d4a5bd4 100644
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -345,7 +345,9 @@ struct GNUNET_AsyncScopeSave
  *  #GNUNET_NO to stop iteration with no error,
  *  #GNUNET_SYSERR to abort iteration with error!
  */
-typedef int (*GNUNET_FileNameCallback) (void *cls, const char *filename);
+typedef int
+(*GNUNET_FileNameCallback) (void *cls,
+                            const char *filename);
 
 
 /**
@@ -353,7 +355,8 @@ typedef int (*GNUNET_FileNameCallback) (void *cls, const char *filename);
  *
  * @param cls  Closure.
  */
-typedef void (*GNUNET_ContinuationCallback) (void *cls);
+typedef void
+(*GNUNET_ContinuationCallback) (void *cls);
 
 
 /**
@@ -368,10 +371,11 @@ typedef void (*GNUNET_ContinuationCallback) (void *cls);
  * @param data_size
  *        Size of @a data.
  */
-typedef void (*GNUNET_ResultCallback) (void *cls,
-                                       int64_t result_code,
-                                       const void *data,
-                                       uint16_t data_size);
+typedef void
+(*GNUNET_ResultCallback) (void *cls,
+                          int64_t result_code,
+                          const void *data,
+                          uint16_t data_size);
 
 
 /* ****************************** logging ***************************** */
@@ -453,11 +457,11 @@ __attribute__ ((format (printf, 2, 3)));
   __extension__ ({                  \
     int _gnunet_boolean_var_;      \
     if (expr)                      \
-      _gnunet_boolean_var_ = 1;    \
+    _gnunet_boolean_var_ = 1;    \
     else                           \
-      _gnunet_boolean_var_ = 0;    \
+    _gnunet_boolean_var_ = 0;    \
     _gnunet_boolean_var_;          \
-  })
+    })
 #define GN_LIKELY(expr) (__builtin_expect (_GNUNET_BOOLEAN_EXPR (expr), 1))
 #define GN_UNLIKELY(expr) (__builtin_expect (_GNUNET_BOOLEAN_EXPR (expr), 0))
 #else
@@ -495,12 +499,12 @@ GNUNET_log_from_nocheck (enum GNUNET_ErrorType kind,
         ((GNUNET_ERROR_TYPE_DEBUG & (kind)) == 0))                        \
     {                                                                     \
       if (GN_UNLIKELY (log_call_enabled == -1))                           \
-        log_call_enabled =                                                \
-          GNUNET_get_log_call_status ((kind) & (~GNUNET_ERROR_TYPE_BULK), \
-                                      (comp),                             \
-                                      __FILE__,                           \
-                                      __FUNCTION__,                       \
-                                      __LINE__);                          \
+      log_call_enabled =                                                \
+        GNUNET_get_log_call_status ((kind) & (~GNUNET_ERROR_TYPE_BULK), \
+                                    (comp),                             \
+                                    __FILE__,                           \
+                                    __FUNCTION__,                       \
+                                    __LINE__);                          \
       if (GN_UNLIKELY (GNUNET_get_log_skip () > 0))                       \
       {                                                                   \
         GNUNET_log_skip (-1, GNUNET_NO);                                  \
@@ -508,7 +512,7 @@ GNUNET_log_from_nocheck (enum GNUNET_ErrorType kind,
       else                                                                \
       {                                                                   \
         if (GN_UNLIKELY (log_call_enabled))                               \
-          GNUNET_log_from_nocheck ((kind), comp, __VA_ARGS__);            \
+        GNUNET_log_from_nocheck ((kind), comp, __VA_ARGS__);            \
       }                                                                   \
     }                                                                     \
   } while (0)
@@ -521,12 +525,12 @@ GNUNET_log_from_nocheck (enum GNUNET_ErrorType kind,
         ((GNUNET_ERROR_TYPE_DEBUG & (kind)) == 0))                        \
     {                                                                     \
       if (GN_UNLIKELY (log_call_enabled == -1))                           \
-        log_call_enabled =                                                \
-          GNUNET_get_log_call_status ((kind) & (~GNUNET_ERROR_TYPE_BULK), \
-                                      NULL,                               \
-                                      __FILE__,                           \
-                                      __FUNCTION__,                       \
-                                      __LINE__);                          \
+      log_call_enabled =                                                \
+        GNUNET_get_log_call_status ((kind) & (~GNUNET_ERROR_TYPE_BULK), \
+                                    NULL,                               \
+                                    __FILE__,                           \
+                                    __FUNCTION__,                       \
+                                    __LINE__);                          \
       if (GN_UNLIKELY (GNUNET_get_log_skip () > 0))                       \
       {                                                                   \
         GNUNET_log_skip (-1, GNUNET_NO);                                  \
@@ -534,7 +538,7 @@ GNUNET_log_from_nocheck (enum GNUNET_ErrorType kind,
       else                                                                \
       {                                                                   \
         if (GN_UNLIKELY (log_call_enabled))                               \
-          GNUNET_log_nocheck ((kind), __VA_ARGS__);                       \
+        GNUNET_log_nocheck ((kind), __VA_ARGS__);                       \
       }                                                                   \
     }                                                                     \
   } while (0)
@@ -766,6 +770,12 @@ GNUNET_e2s2 (const struct GNUNET_CRYPTO_EcdhePublicKey *p);
 
 
 /**
+ * Forward declaration to make compiler happy depending on include order.
+ */
+struct GNUNET_PeerIdentity;
+
+
+/**
  * @ingroup logging
  * Convert a peer identity to a string (for printing debug messages).
  * This is one of the very few calls in the entire API that is
@@ -1271,6 +1281,7 @@ GNUNET_is_zero_ (const void *a,
 #define GNUNET_malloc_large(size) \
   GNUNET_xmalloc_unchecked_ (size, __FILE__, __LINE__)
 
+
 /**
  * @ingroup memory
  * Wrapper around realloc. Reallocates size bytes of memory.
@@ -1283,6 +1294,7 @@ GNUNET_is_zero_ (const void *a,
 #define GNUNET_realloc(ptr, size) \
   GNUNET_xrealloc_ (ptr, size, __FILE__, __LINE__)
 
+
 /**
  * @ingroup memory
  * Wrapper around free. Frees the memory referred to by ptr.
@@ -1290,40 +1302,27 @@ GNUNET_is_zero_ (const void *a,
  * allocated with #GNUNET_array_grow using #GNUNET_array_grow(mem, size, 0) instead of #GNUNET_free_nz.
  *
  * @param ptr location where to free the memory. ptr must have
- *     been returned by #GNUNET_strdup, #GNUNET_strndup, #GNUNET_malloc or #GNUNET_array_grow earlier.
+ *     been returned by #GNUNET_strdup, #GNUNET_strndup, #GNUNET_malloc or #GNUNET_array_grow earlier.  NULL is allowed.
  */
 #define GNUNET_free_nz(ptr) GNUNET_xfree_ (ptr, __FILE__, __LINE__)
 
+
 /**
  * @ingroup memory
  * Wrapper around free. Frees the memory referred to by ptr and sets ptr to NULL.
  * Note that it is generally better to free memory that was
  * allocated with #GNUNET_array_grow using #GNUNET_array_grow(mem, size, 0) instead of #GNUNET_free.
  *
+ * @a ptr will be set to NULL. Use #GNUNET_free_nz() if @a ptr is not an L-value.
+ *
  * @param ptr location where to free the memory. ptr must have
- *     been returned by #GNUNET_strdup, #GNUNET_strndup, #GNUNET_malloc or #GNUNET_array_grow earlier.
+ *     been returned by #GNUNET_strdup, #GNUNET_strndup, #GNUNET_malloc or #GNUNET_array_grow earlier.  NULL is allowed.
  */
 #define GNUNET_free(ptr) do { \
-    GNUNET_xfree_ (ptr, __FILE__, __LINE__); \
-    ptr = NULL; \
+  GNUNET_xfree_ (ptr, __FILE__, __LINE__); \
+  ptr = NULL; \
 } while (0)
 
-/**
- * @ingroup memory
- * Free the memory pointed to by ptr if ptr is not NULL.
- * Equivalent to `if (NULL != ptr) GNUNET_free(ptr)`.
- *
- * @param ptr the location in memory to free
- */
-#define GNUNET_free_non_null(ptr) \
-  do                              \
-  {                               \
-    void *__x__ = ptr;            \
-    if (NULL != __x__)            \
-    {                             \
-      GNUNET_free (__x__);        \
-    }                             \
-  } while (0)
 
 /**
  * @ingroup memory
diff --git a/src/include/gnunet_configuration_lib.h b/src/include/gnunet_configuration_lib.h
index 302429430..f782509eb 100644
--- a/src/include/gnunet_configuration_lib.h
+++ b/src/include/gnunet_configuration_lib.h
@@ -101,6 +101,18 @@ GNUNET_CONFIGURATION_load_from (struct GNUNET_CONFIGURATION_Handle *cfg,
 
 
 /**
+ * Return GNUnet's default configuration.  A new configuration is allocated
+ * each time and it's up to the caller to destroy it when done.  This function
+ * returns GNUnet's configuration even when #GNUNET_OS_init has been called
+ * with a value different from #GNUNET_OS_project_data_default.
+ *
+ * @return a freshly allocated configuration
+ */
+struct GNUNET_CONFIGURATION_Handle *
+GNUNET_CONFIGURATION_default (void);
+
+
+/**
  * Parse a configuration file, add all of the options in the
  * file to the configuration environment.
  *
diff --git a/src/include/gnunet_constants.h b/src/include/gnunet_constants.h
index e1572635f..8b3cbc7e6 100644
--- a/src/include/gnunet_constants.h
+++ b/src/include/gnunet_constants.h
@@ -47,7 +47,8 @@ extern "C"
  * so that at least one maximum-size message can be send roughly once
  * per minute.
  */
-#define GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT GNUNET_BANDWIDTH_value_init (1024)
+#define GNUNET_CONSTANTS_DEFAULT_BW_IN_OUT GNUNET_BANDWIDTH_value_init (1024 \
+                                                                        * 1024)
 
 /**
  * After how long do we consider a connection to a peer dead
diff --git a/src/include/gnunet_container_lib.h b/src/include/gnunet_container_lib.h
index f3325a064..8d8cbf4c1 100644
--- a/src/include/gnunet_container_lib.h
+++ b/src/include/gnunet_container_lib.h
@@ -2158,9 +2158,9 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy (
     (element)->next = (head);                                           \
     (element)->prev = NULL;                                             \
     if ((tail) == NULL)                                                 \
-      (tail) = element;                                                 \
+    (tail) = element;                                                 \
     else                                                                \
-      (head)->prev = element;                                           \
+    (head)->prev = element;                                           \
     (head) = (element);                                                 \
   } while (0)
 
@@ -2182,9 +2182,9 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy (
     (element)->prev = (tail);                                           \
     (element)->next = NULL;                                             \
     if ((head) == NULL)                                                 \
-      (head) = element;                                                 \
+    (head) = element;                                                 \
     else                                                                \
-      (tail)->next = element;                                           \
+    (tail)->next = element;                                           \
     (tail) = (element);                                                 \
   } while (0)
 
@@ -2216,9 +2216,9 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy (
       (other)->next = (element);                                        \
     }                                                                   \
     if (NULL == (element)->next)                                        \
-      (tail) = (element);                                               \
+    (tail) = (element);                                               \
     else                                                                \
-      (element)->next->prev = (element);                                \
+    (element)->next->prev = (element);                                \
   } while (0)
 
 
@@ -2249,9 +2249,9 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy (
       (other)->prev = (element);                                        \
     }                                                                   \
     if (NULL == (element)->prev)                                        \
-      (head) = (element);                                               \
+    (head) = (element);                                               \
     else                                                                \
-      (element)->prev->next = (element);                                \
+    (element)->prev->next = (element);                                \
   } while (0)
 
 
@@ -2275,13 +2275,13 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy (
     GNUNET_assert (((element)->prev != NULL) || ((head) == (element))); \
     GNUNET_assert (((element)->next != NULL) || ((tail) == (element))); \
     if ((element)->prev == NULL)                                        \
-      (head) = (element)->next;                                         \
+    (head) = (element)->next;                                         \
     else                                                                \
-      (element)->prev->next = (element)->next;                          \
+    (element)->prev->next = (element)->next;                          \
     if ((element)->next == NULL)                                        \
-      (tail) = (element)->prev;                                         \
+    (tail) = (element)->prev;                                         \
     else                                                                \
-      (element)->next->prev = (element)->prev;                          \
+    (element)->next->prev = (element)->prev;                          \
     (element)->next = NULL;                                             \
     (element)->prev = NULL;                                             \
   } while (0)
@@ -2308,9 +2308,9 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy (
     (element)->next_ ## mdll = (head);                                           \
     (element)->prev_ ## mdll = NULL;                                             \
     if ((tail) == NULL)                                                        \
-      (tail) = element;                                                        \
+    (tail) = element;                                                        \
     else                                                                       \
-      (head)->prev_ ## mdll = element;                                           \
+    (head)->prev_ ## mdll = element;                                           \
     (head) = (element);                                                        \
   } while (0)
 
@@ -2333,9 +2333,9 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy (
     (element)->prev_ ## mdll = (tail);                                           \
     (element)->next_ ## mdll = NULL;                                             \
     if ((head) == NULL)                                                        \
-      (head) = element;                                                        \
+    (head) = element;                                                        \
     else                                                                       \
-      (tail)->next_ ## mdll = element;                                           \
+    (tail)->next_ ## mdll = element;                                           \
     (tail) = (element);                                                        \
   } while (0)
 
@@ -2368,9 +2368,9 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy (
       (other)->next_ ## mdll = (element);                                        \
     }                                                                          \
     if (NULL == (element)->next_ ## mdll)                                        \
-      (tail) = (element);                                                      \
+    (tail) = (element);                                                      \
     else                                                                       \
-      (element)->next_ ## mdll->prev_ ## mdll = (element);                         \
+    (element)->next_ ## mdll->prev_ ## mdll = (element);                         \
   } while (0)
 
 
@@ -2402,9 +2402,9 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy (
       (other)->prev_ ## mdll = (element);                                        \
     }                                                                          \
     if (NULL == (element)->prev_ ## mdll)                                        \
-      (head) = (element);                                                      \
+    (head) = (element);                                                      \
     else                                                                       \
-      (element)->prev_ ## mdll->next_ ## mdll = (element);                         \
+    (element)->prev_ ## mdll->next_ ## mdll = (element);                         \
   } while (0)
 
 
@@ -2425,13 +2425,13 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy (
     GNUNET_assert (((element)->prev_ ## mdll != NULL) || ((head) == (element))); \
     GNUNET_assert (((element)->next_ ## mdll != NULL) || ((tail) == (element))); \
     if ((element)->prev_ ## mdll == NULL)                                        \
-      (head) = (element)->next_ ## mdll;                                         \
+    (head) = (element)->next_ ## mdll;                                         \
     else                                                                       \
-      (element)->prev_ ## mdll->next_ ## mdll = (element)->next_ ## mdll;            \
+    (element)->prev_ ## mdll->next_ ## mdll = (element)->next_ ## mdll;            \
     if ((element)->next_ ## mdll == NULL)                                        \
-      (tail) = (element)->prev_ ## mdll;                                         \
+    (tail) = (element)->prev_ ## mdll;                                         \
     else                                                                       \
-      (element)->next_ ## mdll->prev_ ## mdll = (element)->prev_ ## mdll;            \
+    (element)->next_ ## mdll->prev_ ## mdll = (element)->prev_ ## mdll;            \
     (element)->next_ ## mdll = NULL;                                             \
     (element)->prev_ ## mdll = NULL;                                             \
   } while (0)
@@ -2468,8 +2468,8 @@ GNUNET_CONTAINER_multihashmap32_iterator_destroy (
       TYPE *pos;                                                            \
                                                                             \
       for (pos = head; NULL != pos; pos = pos->next)                        \
-        if (0 < comparator (comparator_cls, element, pos))                  \
-          break; /* element < pos */                                        \
+      if (0 < comparator (comparator_cls, element, pos))                  \
+      break;     /* element < pos */                                        \
       if (NULL == pos)     /* => element > tail */                              \
       {                                                                     \
         GNUNET_CONTAINER_DLL_insert_tail (head, tail, element);             \
diff --git a/src/include/gnunet_curl_lib.h b/src/include/gnunet_curl_lib.h
index 875cfa3bd..9de58d608 100644
--- a/src/include/gnunet_curl_lib.h
+++ b/src/include/gnunet_curl_lib.h
@@ -225,13 +225,9 @@ typedef void
  * upon its completion. Note that the context will make use of the
  * CURLOPT_PRIVATE facility of the CURL @a eh.
  *
- * This function modifies the CURL handle to add the
- * "Content-Type: application/json" header if @a add_json is set.
- *
  * @param ctx context to execute the job in
  * @param eh curl easy handle for the request, will
  *           be executed AND cleaned up
- * @param add_json add "application/json" content type header
  * @param jcc callback to invoke upon completion
  * @param jcc_cls closure for @a jcc
  * @return NULL on error (in this case, @eh is still released!)
@@ -239,13 +235,70 @@ typedef void
 struct GNUNET_CURL_Job *
 GNUNET_CURL_job_add (struct GNUNET_CURL_Context *ctx,
                      CURL *eh,
-                     int add_json,
                      GNUNET_CURL_JobCompletionCallback jcc,
                      void *jcc_cls);
 
 
 /**
  * Schedule a CURL request to be executed and call the given @a jcc
+ * upon its completion. Note that the context will make use of the
+ * CURLOPT_PRIVATE facility of the CURL @a eh.
+ *
+ * This function modifies the CURL handle to add the
+ * "Content-Type: application/json" header.
+ *
+ * @param ctx context to execute the job in
+ * @param eh curl easy handle for the request, will
+ *           be executed AND cleaned up
+ * @param jcc callback to invoke upon completion
+ * @param jcc_cls closure for @a jcc
+ * @return NULL on error (in this case, @eh is still released!)
+ */
+struct GNUNET_CURL_Job *
+GNUNET_CURL_job_add_with_ct_json (struct GNUNET_CURL_Context *ctx,
+                                  CURL *eh,
+                                  GNUNET_CURL_JobCompletionCallback jcc,
+                                  void *jcc_cls);
+
+
+/**
+ * Force use of the provided username and password
+ * for client authentication for all operations performed
+ * with @a ctx.
+ *
+ * @param ctx context to set authentication data for
+ * @param userpass string with "$USERNAME:$PASSWORD"
+ */
+void
+GNUNET_CURL_set_userpass (struct GNUNET_CURL_Context *ctx,
+                          const char *userpass);
+
+
+/**
+ * Force use of the provided TLS client certificate
+ * for client authentication for all operations performed
+ * with @a ctx.
+ *
+ * Note that if the provided information is incorrect,
+ * the earliest operation that could fail is
+ * #GNUNET_CURL_job_add() or #GNUNET_CURL_job_add2()!
+ *
+ * @param ctx context to set authentication data for
+ * @param certtype type of the certificate
+ * @param certfile file with the certificate
+ * @param keyfile file with the private key
+ * @param keypass passphrase to decrypt @a keyfile (or NULL)
+ */
+void
+GNUNET_CURL_set_tlscert (struct GNUNET_CURL_Context *ctx,
+                         const char *certtype,
+                         const char *certfile,
+                         const char *keyfile,
+                         const char *keypass);
+
+
+/**
+ * Schedule a CURL request to be executed and call the given @a jcc
  * upon its completion.  Note that the context will make use of the
  * CURLOPT_PRIVATE facility of the CURL @a eh.
  *
diff --git a/src/include/gnunet_disk_lib.h b/src/include/gnunet_disk_lib.h
index f43cf8943..51ae7d8d5 100644
--- a/src/include/gnunet_disk_lib.h
+++ b/src/include/gnunet_disk_lib.h
@@ -391,33 +391,54 @@ GNUNET_DISK_file_handle_size (struct GNUNET_DISK_FileHandle *fh,
 
 
 /**
+ * Flags for #GNUNET_DISK_pipe().
+ */
+enum GNUNET_DISK_PipeFlags
+{
+
+  /**
+   * No special options, use non-blocking read/write operations.
+   */
+  GNUNET_DISK_PF_NONE,
+
+  /**
+   * Configure read end to block when reading if set.
+   */
+  GNUNET_DISK_PF_BLOCKING_READ = 1,
+  /**
+   * Configure write end to block when writing if set.
+   */
+  GNUNET_DISK_PF_BLOCKING_WRITE = 2,
+
+  /**
+   * Configure both pipe ends for blocking operations if set.
+   */
+  GNUNET_DISK_PF_BLOCKING_RW = GNUNET_DISK_PF_BLOCKING_READ
+                               | GNUNET_DISK_PF_BLOCKING_WRITE
+
+};
+
+
+/**
  * Creates an interprocess channel
  *
- * @param blocking_read creates an asynchronous pipe for reading if set to #GNUNET_NO
- * @param blocking_write creates an asynchronous pipe for writing if set to #GNUNET_NO
- * @param inherit_read 1 to make read handle inheritable, 0 otherwise (NT only)
- * @param inherit_write 1 to make write handle inheritable, 0 otherwise (NT only)
+ * @param pf how to configure the pipe
  * @return handle to the new pipe, NULL on error
  */
 struct GNUNET_DISK_PipeHandle *
-GNUNET_DISK_pipe (int blocking_read,
-                  int blocking_write,
-                  int inherit_read,
-                  int inherit_write);
+GNUNET_DISK_pipe (enum GNUNET_DISK_PipeFlags pf);
 
 
 /**
  * Creates a pipe object from a couple of file descriptors.
  * Useful for wrapping existing pipe FDs.
  *
- * @param blocking_read creates an asynchronous pipe for reading if set to #GNUNET_NO
- * @param blocking_write creates an asynchronous pipe for writing if set to #GNUNET_NO
+ * @param pf how to configure the pipe
  * @param fd an array of two fd values. One of them may be -1 for read-only or write-only pipes
  * @return handle to the new pipe, NULL on error
  */
 struct GNUNET_DISK_PipeHandle *
-GNUNET_DISK_pipe_from_fd (int blocking_read,
-                          int blocking_write,
+GNUNET_DISK_pipe_from_fd (enum GNUNET_DISK_PipeFlags pf,
                           int fd[2]);
 
 
@@ -479,6 +500,7 @@ const struct GNUNET_DISK_FileHandle *
 GNUNET_DISK_pipe_handle (const struct GNUNET_DISK_PipeHandle *p,
                          enum GNUNET_DISK_PipeEnd n);
 
+
 /**
  * Update POSIX permissions mask of a file on disk.  If both argumets
  * are #GNUNET_NO, the file is made world-read-write-executable (777).
diff --git a/src/include/gnunet_identity_service.h b/src/include/gnunet_identity_service.h
index f4e653598..94127248e 100644
--- a/src/include/gnunet_identity_service.h
+++ b/src/include/gnunet_identity_service.h
@@ -86,9 +86,9 @@ GNUNET_IDENTITY_ego_get_private_key (const struct GNUNET_IDENTITY_Ego *ego);
 /**
  * Obtain the ego representing 'anonymous' users.
  *
- * @return handle for the anonymous user, must not be freed
+ * @return handle for the anonymous user, MUST NOT be freed
  */
-const struct GNUNET_IDENTITY_Ego *
+struct GNUNET_IDENTITY_Ego *
 GNUNET_IDENTITY_ego_get_anonymous (void);
 
 
diff --git a/src/include/gnunet_mq_lib.h b/src/include/gnunet_mq_lib.h
index 520027dbb..37f21e5b1 100644
--- a/src/include/gnunet_mq_lib.h
+++ b/src/include/gnunet_mq_lib.h
@@ -547,7 +547,7 @@ struct GNUNET_MQ_MessageHandler
  */
 #define GNUNET_MQ_hd_fixed_size(name, code, str, ctx)                   \
   ({                                                                    \
-    void (*_cb)(void *cls, const str * msg) = &handle_ ## name;           \
+    void (*_cb)(void *cls, const str *msg) = &handle_ ## name;           \
     ((struct GNUNET_MQ_MessageHandler){ NULL,                            \
                                         (GNUNET_MQ_MessageCallback) _cb, \
                                         (ctx),                           \
@@ -598,8 +598,8 @@ struct GNUNET_MQ_MessageHandler
  */
 #define GNUNET_MQ_hd_var_size(name, code, str, ctx)                          \
   __extension__ ({                                                            \
-    int (*_mv)(void *cls, const str * msg) = &check_ ## name;                  \
-    void (*_cb)(void *cls, const str * msg) = &handle_ ## name;                \
+    int (*_mv)(void *cls, const str *msg) = &check_ ## name;                  \
+    void (*_cb)(void *cls, const str *msg) = &handle_ ## name;                \
     ((struct GNUNET_MQ_MessageHandler){ (GNUNET_MQ_MessageValidationCallback) \
                                         _mv,                                \
                                         (GNUNET_MQ_MessageCallback) _cb,      \
diff --git a/src/include/gnunet_os_lib.h b/src/include/gnunet_os_lib.h
index b583cc493..749f766d2 100644
--- a/src/include/gnunet_os_lib.h
+++ b/src/include/gnunet_os_lib.h
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2011 GNUnet e.V.
+     Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2011, 2020 GNUnet e.V.
 
      GNUnet is free software: you can redistribute it and/or modify it
      under the terms of the GNU Affero General Public License as published
@@ -100,7 +100,12 @@ enum GNUNET_OS_InheritStdioFlags
    * Use this option to have all of the standard streams
    * (stdin, stdout and stderror) be inherited.
    */
-  GNUNET_OS_INHERIT_STD_ALL = 7
+  GNUNET_OS_INHERIT_STD_ALL = 7,
+
+  /**
+   * Should a pipe be used to send signals to the child?
+   */
+  GNUNET_OS_USE_PIPE_CONTROL = 8
 };
 
 
@@ -455,7 +460,6 @@ GNUNET_OS_process_get_pid (struct GNUNET_OS_Process *proc);
 /**
  * Start a process.
  *
- * @param pipe_control should a pipe be used to send signals to the child?
  * @param std_inheritance a set of GNUNET_OS_INHERIT_STD_* flags
  * @param pipe_stdin pipe to use to send input to child process (or NULL)
  * @param pipe_stdout pipe to use to get output from child process (or NULL)
@@ -465,8 +469,7 @@ GNUNET_OS_process_get_pid (struct GNUNET_OS_Process *proc);
  * @return pointer to process structure of the new process, NULL on error
  */
 struct GNUNET_OS_Process *
-GNUNET_OS_start_process_vap (int pipe_control,
-                             enum GNUNET_OS_InheritStdioFlags std_inheritance,
+GNUNET_OS_start_process_vap (enum GNUNET_OS_InheritStdioFlags std_inheritance,
                              struct GNUNET_DISK_PipeHandle *pipe_stdin,
                              struct GNUNET_DISK_PipeHandle *pipe_stdout,
                              struct GNUNET_DISK_PipeHandle *pipe_stderr,
@@ -477,7 +480,6 @@ GNUNET_OS_start_process_vap (int pipe_control,
 /**
  * Start a process.
  *
- * @param pipe_control should a pipe be used to send signals to the child?
  * @param std_inheritance a set of GNUNET_OS_INHERIT_STD_* flags
  * @param pipe_stdin pipe to use to send input to child process (or NULL)
  * @param pipe_stdout pipe to use to get output from child process (or NULL)
@@ -487,8 +489,7 @@ GNUNET_OS_start_process_vap (int pipe_control,
  * @return pointer to process structure of the new process, NULL on error
  */
 struct GNUNET_OS_Process *
-GNUNET_OS_start_process (int pipe_control,
-                         enum GNUNET_OS_InheritStdioFlags std_inheritance,
+GNUNET_OS_start_process (enum GNUNET_OS_InheritStdioFlags std_inheritance,
                          struct GNUNET_DISK_PipeHandle *pipe_stdin,
                          struct GNUNET_DISK_PipeHandle *pipe_stdout,
                          struct GNUNET_DISK_PipeHandle *pipe_stderr,
@@ -498,7 +499,6 @@ GNUNET_OS_start_process (int pipe_control,
 /**
  * Start a process.
  *
- * @param pipe_control should a pipe be used to send signals to the child?
  * @param std_inheritance a set of GNUNET_OS_INHERIT_STD_* flags
  * @param pipe_stdin pipe to use to send input to child process (or NULL)
  * @param pipe_stdout pipe to use to get output from child process (or NULL)
@@ -508,8 +508,7 @@ GNUNET_OS_start_process (int pipe_control,
  * @return pointer to process structure of the new process, NULL on error
  */
 struct GNUNET_OS_Process *
-GNUNET_OS_start_process_va (int pipe_control,
-                            enum GNUNET_OS_InheritStdioFlags std_inheritance,
+GNUNET_OS_start_process_va (enum GNUNET_OS_InheritStdioFlags std_inheritance,
                             struct GNUNET_DISK_PipeHandle *pipe_stdin,
                             struct GNUNET_DISK_PipeHandle *pipe_stdout,
                             struct GNUNET_DISK_PipeHandle *pipe_stderr,
@@ -518,7 +517,6 @@ GNUNET_OS_start_process_va (int pipe_control,
 /**
  * Start a process.
  *
- * @param pipe_control should a pipe be used to send signals to the child?
  * @param std_inheritance a set of GNUNET_OS_INHERIT_STD_* flags
  * @param lsocks array of listen sockets to dup systemd-style (or NULL);
  *         must be NULL on platforms where dup is not supported
@@ -528,8 +526,7 @@ GNUNET_OS_start_process_va (int pipe_control,
  * @return pointer to process structure of the new process, NULL on error
  */
 struct GNUNET_OS_Process *
-GNUNET_OS_start_process_v (int pipe_control,
-                           enum GNUNET_OS_InheritStdioFlags std_inheritance,
+GNUNET_OS_start_process_v (enum GNUNET_OS_InheritStdioFlags std_inheritance,
                            const int *lsocks,
                            const char *filename,
                            char *const argv[]);
@@ -542,7 +539,6 @@ GNUNET_OS_start_process_v (int pipe_control,
  * in the order they appear.  Arguments containing spaces can be used by
  * quoting them with @em ".
  *
- * @param pipe_control should a pipe be used to send signals to the child?
  * @param std_inheritance a set of GNUNET_OS_INHERIT_STD_* flags
  * @param lsocks array of listen sockets to dup systemd-style (or NULL);
  *         must be NULL on platforms where dup is not supported
@@ -554,8 +550,7 @@ GNUNET_OS_start_process_v (int pipe_control,
  * @return pointer to process structure of the new process, NULL on error
  */
 struct GNUNET_OS_Process *
-GNUNET_OS_start_process_s (int pipe_control,
-                           unsigned int std_inheritance,
+GNUNET_OS_start_process_s (enum GNUNET_OS_InheritStdioFlags std_inheritance,
                            const int *lsocks,
                            const char *filename, ...);
 
diff --git a/src/include/gnunet_reclaim_lib.h b/src/include/gnunet_reclaim_lib.h
index 54d284f3c..4f2d6dba5 100644
--- a/src/include/gnunet_reclaim_lib.h
+++ b/src/include/gnunet_reclaim_lib.h
@@ -80,7 +80,7 @@ static const struct GNUNET_RECLAIM_Identifier GNUNET_RECLAIM_ID_ZERO;
                                           memcmp (a, \
                                                   b, \
                                                   sizeof (GNUNET_RECLAIM_ID_ZERO))) \
-  ? \
+                                         ? \
                                          GNUNET_YES : GNUNET_NO)
 
 
diff --git a/src/include/gnunet_reclaim_plugin.h b/src/include/gnunet_reclaim_plugin.h
index 992ad0cc3..7ee9e730f 100644
--- a/src/include/gnunet_reclaim_plugin.h
+++ b/src/include/gnunet_reclaim_plugin.h
@@ -172,7 +172,9 @@ typedef const char *(*GNUNET_RECLAIM_AttestationNumberToTypenameFunction) (
  * @param attest the attestation object
  * @return an attribute list
  */
-typedef struct GNUNET_RECLAIM_AttributeList *(*GNUNET_RECLAIM_AttestationGetAttributesFunction) (
+typedef struct
+  GNUNET_RECLAIM_AttributeList *(*
+GNUNET_RECLAIM_AttestationGetAttributesFunction) (
   void *cls,
   const struct GNUNET_RECLAIM_Attestation *attest);
 
@@ -201,7 +203,6 @@ typedef int (*GNUNET_RECLAIM_AttestationGetExpirationFunction) (
   struct GNUNET_TIME_Absolute *expiration);
 
 
-
 /**
  * Each plugin is required to return a pointer to a struct of this
  * type as the return value from its entry point.
@@ -283,7 +284,6 @@ struct GNUNET_RECLAIM_AttestationPluginFunctions
 };
 
 
-
 #if 0 /* keep Emacsens' auto-indent happy */
 {
 #endif
diff --git a/src/include/gnunet_reclaim_service.h b/src/include/gnunet_reclaim_service.h
index 813bc1a59..139c44ae7 100644
--- a/src/include/gnunet_reclaim_service.h
+++ b/src/include/gnunet_reclaim_service.h
@@ -335,7 +335,8 @@ GNUNET_RECLAIM_get_attestations_start (
  * @param it the iterator
  */
 void
-GNUNET_RECLAIM_get_attestations_next (struct GNUNET_RECLAIM_AttestationIterator *ait);
+GNUNET_RECLAIM_get_attestations_next (struct
+                                      GNUNET_RECLAIM_AttestationIterator *ait);
 
 
 /**
@@ -346,7 +347,8 @@ GNUNET_RECLAIM_get_attestations_next (struct GNUNET_RECLAIM_AttestationIterator
  * @param it the iterator
  */
 void
-GNUNET_RECLAIM_get_attestations_stop (struct GNUNET_RECLAIM_AttestationIterator *ait);
+GNUNET_RECLAIM_get_attestations_stop (struct
+                                      GNUNET_RECLAIM_AttestationIterator *ait);
 
 
 /**
diff --git a/src/include/platform.h b/src/include/platform.h
index baaf26ad6..10248e5bb 100644
--- a/src/include/platform.h
+++ b/src/include/platform.h
@@ -233,8 +233,8 @@ atoll (const char *nptr);
 
 
 #if defined(__sparc__)
-#define MAKE_UNALIGNED(val) ({ __typeof__((val))__tmp; memmove (&__tmp, &(val), \
-                                                                sizeof((val))); \
+#define MAKE_UNALIGNED(val) ({ __typeof__((val)) __tmp; memmove (&__tmp, &(val), \
+                                                                 sizeof((val))); \
                                __tmp; })
 #else
 #define MAKE_UNALIGNED(val) val
diff --git a/src/json/Makefile.am b/src/json/Makefile.am
index 9cd80851c..2ed05c35a 100644
--- a/src/json/Makefile.am
+++ b/src/json/Makefile.am
@@ -27,6 +27,10 @@ libgnunetjson_la_LIBADD = \
   $(MHD_LIBS) \
   $(XLIB) \
   $(Z_LIBS)
+libgnunetjson_la_DEPENDENCIES = \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la
+
 
 check_PROGRAMS = \
   test_json \
diff --git a/src/json/json_generator.c b/src/json/json_generator.c
index 594fcaf27..3f82a5f17 100644
--- a/src/json/json_generator.c
+++ b/src/json/json_generator.c
@@ -254,7 +254,9 @@ GNUNET_JSON_from_gnsrecord (const char*rname,
       rel_exp.rel_value_us = rd[i].expiration_time;
       expiration_time_str = GNUNET_STRINGS_relative_time_to_string (rel_exp,
                                                                     GNUNET_NO);
-    } else {
+    }
+    else
+    {
       abs_exp.abs_value_us = rd[i].expiration_time;
       expiration_time_str = GNUNET_STRINGS_absolute_time_to_string (abs_exp);
     }
diff --git a/src/json/json_gnsrecord.c b/src/json/json_gnsrecord.c
index fe5858f06..7e11aba94 100644
--- a/src/json/json_gnsrecord.c
+++ b/src/json/json_gnsrecord.c
@@ -136,8 +136,8 @@ parse_record (json_t *data, struct GNUNET_GNSRECORD_Data *rd)
   }
   else if ((1 != rel_exp) &&
            (GNUNET_OK ==
-           GNUNET_STRINGS_fancy_time_to_absolute (expiration_time,
-                                                  &abs_expiration_time)))
+            GNUNET_STRINGS_fancy_time_to_absolute (expiration_time,
+                                                   &abs_expiration_time)))
   {
     rd->expiration_time = abs_expiration_time.abs_value_us;
   }
diff --git a/src/json/json_helper.c b/src/json/json_helper.c
index 02bd6bfab..621487f0a 100644
--- a/src/json/json_helper.c
+++ b/src/json/json_helper.c
@@ -721,7 +721,7 @@ GNUNET_JSON_spec_absolute_time (const char *name,
     .cls = NULL,
     .field = name,
     .ptr = at,
-    .ptr_size = sizeof(uint64_t),
+    .ptr_size = sizeof(struct GNUNET_TIME_Absolute),
     .size_ptr = NULL
   };
 
@@ -775,7 +775,7 @@ GNUNET_JSON_spec_absolute_time_nbo (const char *name,
     .cls = NULL,
     .field = name,
     .ptr = at,
-    .ptr_size = sizeof(uint64_t),
+    .ptr_size = sizeof(struct GNUNET_TIME_AbsoluteNBO),
     .size_ptr = NULL
   };
 
@@ -852,7 +852,7 @@ GNUNET_JSON_spec_relative_time (const char *name,
     .cls = NULL,
     .field = name,
     .ptr = rt,
-    .ptr_size = sizeof(uint64_t),
+    .ptr_size = sizeof(struct GNUNET_TIME_Relative),
     .size_ptr = NULL
   };
 
diff --git a/src/mysql/mysql.c b/src/mysql/mysql.c
index 76effd95a..713227068 100644
--- a/src/mysql/mysql.c
+++ b/src/mysql/mysql.c
@@ -296,9 +296,9 @@ iopen (struct GNUNET_MYSQL_Context *mc)
                       (unsigned int) mysql_port,
                       NULL,
                       CLIENT_IGNORE_SIGPIPE);
-  GNUNET_free_non_null (mysql_server);
-  GNUNET_free_non_null (mysql_user);
-  GNUNET_free_non_null (mysql_password);
+  GNUNET_free (mysql_server);
+  GNUNET_free (mysql_user);
+  GNUNET_free (mysql_password);
   GNUNET_free (mysql_dbname);
   if (mysql_error (mc->dbf)[0])
   {
diff --git a/src/namecache/plugin_namecache_sqlite.c b/src/namecache/plugin_namecache_sqlite.c
index 8f762cb40..c9d79ba2d 100644
--- a/src/namecache/plugin_namecache_sqlite.c
+++ b/src/namecache/plugin_namecache_sqlite.c
@@ -260,7 +260,7 @@ database_shutdown (struct Plugin *plugin)
                 GNUNET_ERROR_TYPE_ERROR,
                 "sqlite3_close");
 
-  GNUNET_free_non_null (plugin->fn);
+  GNUNET_free (plugin->fn);
 }
 
 
diff --git a/src/namestore/Makefile.am b/src/namestore/Makefile.am
index f4b846065..40ac64197 100644
--- a/src/namestore/Makefile.am
+++ b/src/namestore/Makefile.am
@@ -691,8 +691,8 @@ EXTRA_DIST = \
   test_plugin_namestore_postgres.conf \
   test_plugin_namestore_flat.conf \
   test_hostkey \
-  zonefiles/S5I9DSGQVAB5FVV16T3B3CC5H1B2JGL3Q412JBKURME8EKU0600G.zkey \
-  zonefiles/AQ835GVL939H4O8QJQ7GBLPTQC0QAAO91BN7QK01BA63MDSK6I4G.zkey \
-  zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey \
-  zonefiles/N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey \
+  zonefiles/BW7PTMDSN5KS42GMK2VKVE96BAYDS3QVMAS7SC5208FD6HFTAXE0.zkey \
+  zonefiles/KHW2Y5A7X59Z8BC2GHSEQ9WGZ5HWVEF25TBFR3Q5QHCERMVM76DG.zkey \
+  zonefiles/CNFGWF0JH0C65M6PQW6VSRR6D3NEZVHAQF6NC037J01TETS6CJ30.zkey  \
+  zonefiles/TWY43VS959JJ41KN2FG8782EJ2N0XDF4J6BWASR1BK5BPPRWQJAG.zkey \
   $(check_SCRIPTS)
diff --git a/src/namestore/gnunet-namestore.c b/src/namestore/gnunet-namestore.c
index 94fcb8952..07d045b90 100644
--- a/src/namestore/gnunet-namestore.c
+++ b/src/namestore/gnunet-namestore.c
@@ -878,7 +878,7 @@ del_monitor (void *cls,
                                                       rd[i].data_size)))) ||
             (0 == strcmp (vs, value)))))
       rdx[rd_left++] = rd[i];
-    GNUNET_free_non_null (vs);
+    GNUNET_free (vs);
   }
   if (rd_count == rd_left)
   {
@@ -1048,7 +1048,8 @@ run_with_zone_pkey (const struct GNUNET_CONFIGURATION_Handle *cfg)
       return;
     }
     add = 1;
-    typestring = GNUNET_strdup (GNUNET_GNSRECORD_number_to_typename (GNUNET_GNSRECORD_TYPE_NICK));
+    typestring = GNUNET_strdup (GNUNET_GNSRECORD_number_to_typename (
+                                  GNUNET_GNSRECORD_TYPE_NICK));
     name = GNUNET_strdup (GNUNET_GNS_EMPTY_LABEL_AT);
     value = GNUNET_strdup (nickstring);
     is_public = 0;
@@ -1087,6 +1088,17 @@ run_with_zone_pkey (const struct GNUNET_CONFIGURATION_Handle *cfg)
       ret = 1;
       return;
     }
+    if ((GNUNET_DNSPARSER_TYPE_SRV == type) ||
+        (GNUNET_DNSPARSER_TYPE_TLSA == type) ||
+        (GNUNET_DNSPARSER_TYPE_OPENPGPKEY == type))
+    {
+      fprintf (stderr,
+               _ ("For DNS record types `SRV', `TLSA' and `OPENPGPKEY'"));
+      fprintf (stderr, ", please use a `BOX' record instead\n");
+      GNUNET_SCHEDULER_shutdown ();
+      ret = 1;
+      return;
+    }
     if (NULL == value)
     {
       fprintf (stderr,
@@ -1296,7 +1308,7 @@ identity_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
     return;
   }
   zone_pkey = *GNUNET_IDENTITY_ego_get_private_key (ego);
-  GNUNET_free_non_null (ego_name);
+  GNUNET_free (ego_name);
   ego_name = NULL;
   run_with_zone_pkey (cfg);
 }
diff --git a/src/namestore/gnunet-service-namestore.c b/src/namestore/gnunet-service-namestore.c
index c57f15f65..bb8138e23 100644
--- a/src/namestore/gnunet-service-namestore.c
+++ b/src/namestore/gnunet-service-namestore.c
@@ -540,7 +540,7 @@ cache_nick (const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
       break;
     }
   }
-  GNUNET_free_non_null (oldest->rd);
+  GNUNET_free (oldest->rd);
   oldest->zone = *zone;
   if (NULL != nick)
   {
@@ -915,7 +915,7 @@ refresh_block (struct NamestoreClient *nc,
   nick = get_nick_record (zone_key);
   res_count = rd_count;
   res = (struct GNUNET_GNSRECORD_Data *) rd;  /* fixme: a bit unclean... */
-  if (NULL != nick  && (0 != strcmp (name, GNUNET_GNS_EMPTY_LABEL_AT)))
+  if ((NULL != nick) && (0 != strcmp (name, GNUNET_GNS_EMPTY_LABEL_AT)))
   {
     nick->flags =
       (nick->flags | GNUNET_GNSRECORD_RF_PRIVATE) ^ GNUNET_GNSRECORD_RF_PRIVATE;
@@ -1392,7 +1392,7 @@ handle_record_lookup (void *cls, const struct LabelLookupMessage *ll_msg)
   GNUNET_memcpy (&llr_msg[1], name_tmp, name_len);
   GNUNET_memcpy (&res_name[name_len], rlc.res_rd, rlc.rd_ser_len);
   GNUNET_MQ_send (nc->mq, env);
-  GNUNET_free_non_null (rlc.res_rd);
+  GNUNET_free (rlc.res_rd);
 }
 
 
diff --git a/src/namestore/plugin_namestore_sqlite.c b/src/namestore/plugin_namestore_sqlite.c
index a909221e2..45fb782f7 100644
--- a/src/namestore/plugin_namestore_sqlite.c
+++ b/src/namestore/plugin_namestore_sqlite.c
@@ -296,7 +296,7 @@ database_shutdown (struct Plugin *plugin)
                 GNUNET_ERROR_TYPE_ERROR,
                 "sqlite3_close");
 
-  GNUNET_free_non_null (plugin->fn);
+  GNUNET_free (plugin->fn);
 }
 
 
diff --git a/src/namestore/plugin_rest_namestore.c b/src/namestore/plugin_rest_namestore.c
index 95b9b428f..f1cbfb38b 100644
--- a/src/namestore/plugin_rest_namestore.c
+++ b/src/namestore/plugin_rest_namestore.c
@@ -491,7 +491,7 @@ namestore_list_finished (void *cls)
   resp = GNUNET_REST_create_response (result_str);
   MHD_add_response_header (resp, "Content-Type", "application/json");
   handle->proc (handle->proc_cls, resp, MHD_HTTP_OK);
-  GNUNET_free_non_null (result_str);
+  GNUNET_free (result_str);
   GNUNET_SCHEDULER_add_now (&cleanup_handle, handle);
 }
 
@@ -536,6 +536,7 @@ namestore_list_iteration (void *cls,
   GNUNET_NAMESTORE_zone_iterator_next (handle->list_it, 1);
 }
 
+
 /**
  * Handle lookup error
  *
@@ -553,10 +554,10 @@ ns_lookup_error_cb (void *cls)
 
 static void
 ns_get_lookup_cb (void *cls,
-              const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
-              const char *label,
-              unsigned int rd_len,
-              const struct GNUNET_GNSRECORD_Data *rd)
+                  const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
+                  const char *label,
+                  unsigned int rd_len,
+                  const struct GNUNET_GNSRECORD_Data *rd)
 {
   struct RequestHandle *handle = cls;
   struct GNUNET_GNSRECORD_Data rd_filtered[rd_len];
@@ -588,8 +589,6 @@ ns_get_lookup_cb (void *cls,
 }
 
 
-
-
 /**
  * Handle namestore GET request
  *
@@ -666,12 +665,12 @@ namestore_get (struct GNUNET_REST_RequestHandle *con_handle,
   }
   handle->record_name = GNUNET_strdup (labelname + 1);
   handle->ns_qe = GNUNET_NAMESTORE_records_lookup (handle->ns_handle,
-                                                    handle->zone_pkey,
-                                                    handle->record_name,
-                                                    &ns_lookup_error_cb,
-                                                    handle,
-                                                    &ns_get_lookup_cb,
-                                                    handle);
+                                                   handle->zone_pkey,
+                                                   handle->record_name,
+                                                   &ns_lookup_error_cb,
+                                                   handle,
+                                                   &ns_get_lookup_cb,
+                                                   handle);
   if (NULL == handle->ns_qe)
   {
     handle->emsg = GNUNET_strdup (GNUNET_REST_NAMESTORE_FAILED);
@@ -681,7 +680,6 @@ namestore_get (struct GNUNET_REST_RequestHandle *con_handle,
 }
 
 
-
 static void
 ns_lookup_cb (void *cls,
               const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone,
@@ -702,12 +700,12 @@ ns_lookup_cb (void *cls,
   for (j = 0; j < handle->rd_count; j++)
     rd_new[i + j] = handle->rd[j];
   handle->ns_qe = GNUNET_NAMESTORE_records_store (handle->ns_handle,
-                                                   handle->zone_pkey,
-                                                   handle->record_name,
-                                                   i + j,
-                                                   rd_new,
-                                                   &create_finished,
-                                                   handle);
+                                                  handle->zone_pkey,
+                                                  handle->record_name,
+                                                  i + j,
+                                                  rd_new,
+                                                  &create_finished,
+                                                  handle);
   if (NULL == handle->ns_qe)
   {
     handle->emsg = GNUNET_strdup (GNUNET_REST_NAMESTORE_FAILED);
@@ -794,12 +792,12 @@ namestore_add_or_update (struct GNUNET_REST_RequestHandle *con_handle,
   }
   handle->zone_pkey = GNUNET_IDENTITY_ego_get_private_key (ego_entry->ego);
   handle->ns_qe = GNUNET_NAMESTORE_records_lookup (handle->ns_handle,
-                                                    handle->zone_pkey,
-                                                    handle->record_name,
-                                                    &ns_lookup_error_cb,
-                                                    handle,
-                                                    &ns_lookup_cb,
-                                                    handle);
+                                                   handle->zone_pkey,
+                                                   handle->record_name,
+                                                   &ns_lookup_error_cb,
+                                                   handle,
+                                                   &ns_lookup_cb,
+                                                   handle);
   if (NULL == handle->ns_qe)
   {
     handle->emsg = GNUNET_strdup (GNUNET_REST_NAMESTORE_FAILED);
@@ -898,9 +896,9 @@ namestore_delete (struct GNUNET_REST_RequestHandle *con_handle,
                                                   handle->zone_pkey,
                                                   handle->record_name,
                                                   0,
-                                                   NULL,
-                                                   &del_finished,
-                                                   handle);
+                                                  NULL,
+                                                  &del_finished,
+                                                  handle);
   if (NULL == handle->ns_qe)
   {
     handle->emsg = GNUNET_strdup (GNUNET_REST_NAMESTORE_FAILED);
@@ -1109,7 +1107,7 @@ libgnunet_plugin_rest_namestore_done (void *cls)
 
   plugin->cfg = NULL;
 
-  GNUNET_free_non_null (allow_methods);
+  GNUNET_free (allow_methods);
   GNUNET_free (api);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Namestore REST plugin is finished\n");
   return NULL;
diff --git a/src/namestore/test_namestore_api_lookup_nick.c b/src/namestore/test_namestore_api_lookup_nick.c
index 628e76254..14fe7fc70 100644
--- a/src/namestore/test_namestore_api_lookup_nick.c
+++ b/src/namestore/test_namestore_api_lookup_nick.c
@@ -54,11 +54,12 @@ static struct GNUNET_NAMESTORE_QueueEntry *nsqe;
 // static const char * name = "dummy.dummy.gnunet";
 static const char *name = "d";
 
+static char *record_data;
 
 static void
 cleanup ()
 {
-  GNUNET_free_non_null ((void *) rd_orig.data);
+  GNUNET_free (record_data);
   if (NULL != nsh)
   {
     GNUNET_NAMESTORE_disconnect (nsh);
@@ -264,7 +265,8 @@ nick_cont (void *cls, int32_t success, const char *emsg)
   rd_orig.expiration_time = GNUNET_TIME_absolute_get ().abs_value_us;
   rd_orig.record_type = TEST_RECORD_TYPE;
   rd_orig.data_size = TEST_RECORD_DATALEN;
-  rd_orig.data = GNUNET_malloc (TEST_RECORD_DATALEN);
+  record_data = GNUNET_malloc (TEST_RECORD_DATALEN);
+  rd_orig.data = record_data;
   rd_orig.flags = 0;
   memset ((char *) rd_orig.data, 'a', TEST_RECORD_DATALEN);
 
diff --git a/src/namestore/test_namestore_api_monitoring.c b/src/namestore/test_namestore_api_monitoring.c
index cc00adf44..3f1be1403 100644
--- a/src/namestore/test_namestore_api_monitoring.c
+++ b/src/namestore/test_namestore_api_monitoring.c
@@ -88,9 +88,9 @@ do_shutdown ()
     GNUNET_NAMESTORE_disconnect (nsh);
     nsh = NULL;
   }
-  GNUNET_free_non_null (s_name_1);
-  GNUNET_free_non_null (s_name_2);
-  GNUNET_free_non_null (s_name_3);
+  GNUNET_free (s_name_1);
+  GNUNET_free (s_name_2);
+  GNUNET_free (s_name_3);
 
   if (s_rd_1 != NULL)
   {
diff --git a/src/namestore/test_namestore_api_zone_iteration.c b/src/namestore/test_namestore_api_zone_iteration.c
index a363ee28d..5d02b9e49 100644
--- a/src/namestore/test_namestore_api_zone_iteration.c
+++ b/src/namestore/test_namestore_api_zone_iteration.c
@@ -88,9 +88,9 @@ end (void *cls)
     GNUNET_SCHEDULER_cancel (endbadly_task);
     endbadly_task = NULL;
   }
-  GNUNET_free_non_null (s_name_1);
-  GNUNET_free_non_null (s_name_2);
-  GNUNET_free_non_null (s_name_3);
+  GNUNET_free (s_name_1);
+  GNUNET_free (s_name_2);
+  GNUNET_free (s_name_3);
   if (NULL != s_rd_1)
   {
     GNUNET_free_nz ((void *) s_rd_1->data);
diff --git a/src/namestore/test_namestore_api_zone_iteration_nick.c b/src/namestore/test_namestore_api_zone_iteration_nick.c
index 1ebdfd073..4e54a05d2 100644
--- a/src/namestore/test_namestore_api_zone_iteration_nick.c
+++ b/src/namestore/test_namestore_api_zone_iteration_nick.c
@@ -82,9 +82,9 @@ end (void *cls)
     GNUNET_NAMESTORE_disconnect (nsh);
     nsh = NULL;
   }
-  GNUNET_free_non_null (s_name_1);
-  GNUNET_free_non_null (s_name_2);
-  GNUNET_free_non_null (s_name_3);
+  GNUNET_free (s_name_1);
+  GNUNET_free (s_name_2);
+  GNUNET_free (s_name_3);
 
   if (s_rd_1 != NULL)
   {
diff --git a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
index 0534da001..30920713f 100644
--- a/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
+++ b/src/namestore/test_namestore_api_zone_iteration_specific_zone.c
@@ -88,9 +88,9 @@ end (void *cls)
     GNUNET_SCHEDULER_cancel (endbadly_task);
     endbadly_task = NULL;
   }
-  GNUNET_free_non_null (s_name_1);
-  GNUNET_free_non_null (s_name_2);
-  GNUNET_free_non_null (s_name_3);
+  GNUNET_free (s_name_1);
+  GNUNET_free (s_name_2);
+  GNUNET_free (s_name_3);
   if (s_rd_1 != NULL)
   {
     GNUNET_free_nz ((void *) s_rd_1->data);
diff --git a/src/namestore/test_namestore_api_zone_iteration_stop.c b/src/namestore/test_namestore_api_zone_iteration_stop.c
index b71a8789c..bdcdd1706 100644
--- a/src/namestore/test_namestore_api_zone_iteration_stop.c
+++ b/src/namestore/test_namestore_api_zone_iteration_stop.c
@@ -75,9 +75,9 @@ end (void *cls)
     GNUNET_NAMESTORE_disconnect (nsh);
     nsh = NULL;
   }
-  GNUNET_free_non_null (s_name_1);
-  GNUNET_free_non_null (s_name_2);
-  GNUNET_free_non_null (s_name_3);
+  GNUNET_free (s_name_1);
+  GNUNET_free (s_name_2);
+  GNUNET_free (s_name_3);
   if (s_rd_1 != NULL)
   {
     GNUNET_free_nz ((void *) s_rd_1->data);
diff --git a/src/namestore/test_plugin_rest_namestore.sh b/src/namestore/test_plugin_rest_namestore.sh
index 014057e56..12a7fa50c 100755
--- a/src/namestore/test_plugin_rest_namestore.sh
+++ b/src/namestore/test_plugin_rest_namestore.sh
@@ -85,17 +85,17 @@ test="$(gnunet-namestore -D -z $TEST_ID -c test_namestore_api.conf)"
 name=$TEST_ID
 public="$(gnunet-identity -d -c test_namestore_api.conf | grep $TEST_ID | awk 'NR==1{print $3}')"
 gnunet-namestore -z $name -p -a -n "test_entry" -e "1d" -V "HVX38H2CB7WJM0WCPWT9CFX6GASMYJVR65RN75SJSSKAYVYXHMRG" -t "PKEY" -c test_namestore_api.conf
-curl_get "${namestore_link}" "HTTP/1.1 200 OK"
+#curl_get "${namestore_link}" "HTTP/1.1 200 OK"
 curl_get "${namestore_link}/$name" "HTTP/1.1 200 OK"
 curl_get "${namestore_link}/$public" "error"
 gnunet-namestore -z $name -d -n "test_entry" -c test_namestore_api.conf
 
 #Test POST with NAME
-curl_post "${namestore_link}/$name" '{"data": [{"value":"HVX38H2CB7WJM0WCPWT9CFX6GASMYJVR65RN75SJSSKAYVYXHMRG", "record_type":"PKEY", "expiration_time":"1d","flag":0}],"record_name":"test_entry"}' "HTTP/1.1 204 No Content"
+curl_post "${namestore_link}/$name" '{"data": [{"value":"HVX38H2CB7WJM0WCPWT9CFX6GASMYJVR65RN75SJSSKAYVYXHMRG", "record_type":"PKEY", "expiration_time":"1d","private": false, "relative_expiration": false, "supplemental": false, "shadow": false}],"record_name":"test_entry"}' "HTTP/1.1 204 No Content"
 gnunet-namestore -z $name -d -n "test_entry" -c test_namestore_api.conf > /dev/null 2>&1
 
 # invalid values
-curl_post "${namestore_link}/$name" '{"data": [{"value":"HVX38H2CB7WJM0WCPWT9CFX6GASMYJVR65RN75SJSSKAYVYXHMRGxxx", "record_type":"PKEY", "expiration_time":"1d","flag":0}],"record_name":"test_entry"}' "error"
+curl_post "${namestore_link}/$name" '{"data": [{"value":"HVX38H2CB7WJM0WCPWT9CFX6GASMYJVR65RN75SJSSKAYVYXHMRGxxx", "record_type":"PKEY", "expiration_time":"1d","private": false, "relative_expiration": false, "supplemental": false, "shadow": false}],"record_name":"test_entry"}' "error"
 gnunet-namestore -z $name -d -n "test_entry" -c test_namestore_api.conf > /dev/null 2>&1
 
 
@@ -106,30 +106,30 @@ curl_post "${namestore_link}/$name" '{"data": [{"record_type":"PKEY", "expiratio
 gnunet-namestore -z $name -d -n "test_entry" -c test_namestore_api.conf > /dev/null 2>&1
 
 #expirations
-curl_post "${namestore_link}/$name" '{"data": [{"value":"HVX38H2CB7WJM0WCPWT9CFX6GASMYJVR65RN75SJSSKAYVYXHMRG", "record_type":"PKEY", "expiration_time":"0d","flag":0}],"record_name":"test_entry"}' "HTTP/1.1 204"
+curl_post "${namestore_link}/$name" '{"data": [{"value":"HVX38H2CB7WJM0WCPWT9CFX6GASMYJVR65RN75SJSSKAYVYXHMRG", "record_type":"PKEY", "expiration_time":"0d","private": false, "relative_expiration": true, "supplemental": false, "shadow": false}],"record_name":"test_entry"}' "HTTP/1.1 204"
 gnunet-namestore -z $name -d -n "test_entry" -c test_namestore_api.conf > /dev/null 2>&1
 
-curl_post "${namestore_link}/$name" '{"data": [{"value":"HVX38H2CB7WJM0WCPWT9CFX6GASMYJVR65RN75SJSSKAYVYXHMRG", "record_type":"PKEY", "expiration_time":"10000d","flag":0}],"record_name":"test_entry"}' "HTTP/1.1 204"
+curl_post "${namestore_link}/$name" '{"data": [{"value":"HVX38H2CB7WJM0WCPWT9CFX6GASMYJVR65RN75SJSSKAYVYXHMRG", "record_type":"PKEY", "expiration_time":"10000d","private": false, "relative_expiration": true, "supplemental": false, "shadow": false}],"record_name":"test_entry"}' "HTTP/1.1 204"
 gnunet-namestore -z $name -d -n "test_entry" -c test_namestore_api.conf > /dev/null 2>&1
 
-curl_post "${namestore_link}/$name" '{"data": [{"value":"HVX38H2CB7WJM0WCPWT9CFX6GASMYJVR65RN75SJSSKAYVYXHMRG", "record_type":"PKEY", "expiration_time":"now","flag":0}],"record_name":"test_entry"}' "error"
+curl_post "${namestore_link}/$name" '{"data": [{"value":"HVX38H2CB7WJM0WCPWT9CFX6GASMYJVR65RN75SJSSKAYVYXHMRG", "record_type":"PKEY", "expiration_time":"now","private": false, "relative_expiration": false, "supplemental": false, "shadow": false}],"record_name":"test_entry"}' "error"
 gnunet-namestore -z $name -d -n "test_entry" -c test_namestore_api.conf > /dev/null 2>&1
 
-curl_post "${namestore_link}/$name" '{"data": [{"value":"HVX38H2CB7WJM0WCPWT9CFX6GASMYJVR65RN75SJSSKAYVYXHMRG", "record_type":"PKEY", "expiration_time_missing":"1d","flag":0}],"record_name":"test_entry"}' "error"
+curl_post "${namestore_link}/$name" '{"data": [{"value":"HVX38H2CB7WJM0WCPWT9CFX6GASMYJVR65RN75SJSSKAYVYXHMRG", "record_type":"PKEY", "expiration_time_missing":"1d","private": false, "relative_expiration": false, "supplemental": false, "shadow": false}],"record_name":"test_entry"}' "error"
 gnunet-namestore -z $name -d -n "test_entry" -c test_namestore_api.conf > /dev/null 2>&1
 
 #record_name
-curl_post "${namestore_link}/$name" '{"data": [{"value":"HVX38H2CB7WJM0WCPWT9CFX6GASMYJVR65RN75SJSSKAYVYXHMRG", "record_type":"PKEY", "expiration_time":"1d","flag":0}],"record_name":""}' "error"
+curl_post "${namestore_link}/$name" '{"data": [{"value":"HVX38H2CB7WJM0WCPWT9CFX6GASMYJVR65RN75SJSSKAYVYXHMRG", "record_type":"PKEY", "expiration_time":"1d","private": false, "relative_expiration": false, "supplemental": false, "shadow": false}],"record_name":""}' "error"
 gnunet-namestore -z $name -d -n "test_entry"  -c test_namestore_api.conf > /dev/null 2>&1
-curl_post "${namestore_link}/$name" '{"data": [{"value":"HVX38H2CB7WJM0WCPWT9CFX6GASMYJVR65RN75SJSSKAYVYXHMRG", "record_type":"PKEY", "expiration_time":"1d","flag":0}],"record_name_missing":"test_entry"}' "error"
+curl_post "${namestore_link}/$name" '{"data": [{"value":"HVX38H2CB7WJM0WCPWT9CFX6GASMYJVR65RN75SJSSKAYVYXHMRG", "record_type":"PKEY", "expiration_time":"1d","private": false, "relative_expiration": false, "supplemental": false, "shadow": false}],"record_name_missing":"test_entry"}' "error"
 gnunet-namestore -z $name -d -n "test_entry"  -c test_namestore_api.conf > /dev/null 2>&1
 
 #Test DELETE
 gnunet-namestore -z $name -p -a -n "test_entry" -e "1d" -V "HVX38H2CB7WJM0WCPWT9CFX6GASMYJVR65RN75SJSSKAYVYXHMRG" -t "PKEY"  -c test_namestore_api.conf
-curl_delete "${namestore_link}/$name?record_name=test_entry" "HTTP/1.1 204" 
-curl_delete "${namestore_link}/$name?record_name=test_entry" "error" 
+curl_delete "${namestore_link}/$name/test_entry" "HTTP/1.1 204" 
+curl_delete "${namestore_link}/$name/test_entry" "error" 
 gnunet-namestore -z $name -p -a -n "test_entry" -e "1d" -V "HVX38H2CB7WJM0WCPWT9CFX6GASMYJVR65RN75SJSSKAYVYXHMRG" -t "PKEY"  -c test_namestore_api.conf
-curl_delete "${namestore_link}/$public?record_name=test_entry" "error" 
+curl_delete "${namestore_link}/$public/test_entry" "error" 
 
 gnunet-arm -e  -c test_namestore_api.conf
 exit 0;
diff --git a/src/namestore/zonefiles/AQ835GVL939H4O8QJQ7GBLPTQC0QAAO91BN7QK01BA63MDSK6I4G.zkey b/src/namestore/zonefiles/AQ835GVL939H4O8QJQ7GBLPTQC0QAAO91BN7QK01BA63MDSK6I4G.zkey
deleted file mode 100644
index 7dfee2d0b..000000000
--- a/src/namestore/zonefiles/AQ835GVL939H4O8QJQ7GBLPTQC0QAAO91BN7QK01BA63MDSK6I4G.zkey
+++ /dev/null
diff --git a/src/namestore/zonefiles/BW7PTMDSN5KS42GMK2VKVE96BAYDS3QVMAS7SC5208FD6HFTAXE0.zkey b/src/namestore/zonefiles/BW7PTMDSN5KS42GMK2VKVE96BAYDS3QVMAS7SC5208FD6HFTAXE0.zkey
new file mode 100644
index 000000000..0d37aefef
--- /dev/null
+++ b/src/namestore/zonefiles/BW7PTMDSN5KS42GMK2VKVE96BAYDS3QVMAS7SC5208FD6HFTAXE0.zkey
@@ -0,0 +1 @@
+ˆ‘’“ÂÚ  Qž”0ÿ·Ò†d      Õ/Ô#‰`«ÇËÂ$Éf
\ No newline at end of file
diff --git a/src/namestore/zonefiles/CNFGWF0JH0C65M6PQW6VSRR6D3NEZVHAQF6NC037J01TETS6CJ30.zkey b/src/namestore/zonefiles/CNFGWF0JH0C65M6PQW6VSRR6D3NEZVHAQF6NC037J01TETS6CJ30.zkey
new file mode 100644
index 000000000..b5b465ea1
--- /dev/null
+++ b/src/namestore/zonefiles/CNFGWF0JH0C65M6PQW6VSRR6D3NEZVHAQF6NC037J01TETS6CJ30.zkey
diff --git a/src/namestore/zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey b/src/namestore/zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey
deleted file mode 100644
index acc877d4f..000000000
--- a/src/namestore/zonefiles/HGU0A0VCU334DN7F2I9UIUMVQMM7JMSD142LIMNUGTTV9R0CF4EG.zkey
+++ /dev/null
diff --git a/src/namestore/zonefiles/KHW2Y5A7X59Z8BC2GHSEQ9WGZ5HWVEF25TBFR3Q5QHCERMVM76DG.zkey b/src/namestore/zonefiles/KHW2Y5A7X59Z8BC2GHSEQ9WGZ5HWVEF25TBFR3Q5QHCERMVM76DG.zkey
new file mode 100644
index 000000000..7535efb5e
--- /dev/null
+++ b/src/namestore/zonefiles/KHW2Y5A7X59Z8BC2GHSEQ9WGZ5HWVEF25TBFR3Q5QHCERMVM76DG.zkey
@@ -0,0 +1 @@
+p‘Ñç¨Â�¡8&û„�D�6£ Vív+XÃì{   A
\ No newline at end of file
diff --git a/src/namestore/zonefiles/N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey b/src/namestore/zonefiles/N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey
deleted file mode 100644
index 7dfee2d0b..000000000
--- a/src/namestore/zonefiles/N0UJMP015AFUNR2BTNM3FKPBLG38913BL8IDMCO2H0A1LIB81960.zkey
+++ /dev/null
diff --git a/src/namestore/zonefiles/S5I9DSGQVAB5FVV16T3B3CC5H1B2JGL3Q412JBKURME8EKU0600G.zkey b/src/namestore/zonefiles/S5I9DSGQVAB5FVV16T3B3CC5H1B2JGL3Q412JBKURME8EKU0600G.zkey
deleted file mode 100644
index acc877d4f..000000000
--- a/src/namestore/zonefiles/S5I9DSGQVAB5FVV16T3B3CC5H1B2JGL3Q412JBKURME8EKU0600G.zkey
+++ /dev/null
diff --git a/src/namestore/zonefiles/TWY43VS959JJ41KN2FG8782EJ2N0XDF4J6BWASR1BK5BPPRWQJAG.zkey b/src/namestore/zonefiles/TWY43VS959JJ41KN2FG8782EJ2N0XDF4J6BWASR1BK5BPPRWQJAG.zkey
new file mode 100644
index 000000000..ac3ed96a3
--- /dev/null
+++ b/src/namestore/zonefiles/TWY43VS959JJ41KN2FG8782EJ2N0XDF4J6BWASR1BK5BPPRWQJAG.zkey
@@ -0,0 +1,2 @@
+XJèµMíŠÀ …¬½
+dú胦ÓŒòB×=ÏB
\ No newline at end of file
diff --git a/src/nat-auto/gnunet-service-nat-auto_legacy.c b/src/nat-auto/gnunet-service-nat-auto_legacy.c
index 1817c2270..de7910588 100644
--- a/src/nat-auto/gnunet-service-nat-auto_legacy.c
+++ b/src/nat-auto/gnunet-service-nat-auto_legacy.c
@@ -791,7 +791,7 @@ test_icmp_server (struct GNUNET_NAT_AutoHandle *ah)
                 _ ("No working gnunet-helper-nat-server found\n"));
   }
 err:
-  GNUNET_free_non_null (tmp);
+  GNUNET_free (tmp);
   GNUNET_free (helper);
 
   if ((GNUNET_OK == ext_ip) &&
@@ -853,7 +853,7 @@ test_icmp_client (struct GNUNET_NAT_AutoHandle *ah)
                 _ ("No working gnunet-helper-nat-server found\n"));
   }
 err:
-  GNUNET_free_non_null (tmp);
+  GNUNET_free (tmp);
   GNUNET_free (helper);
 
   next_phase (ah);
diff --git a/src/nat/gnunet-nat.c b/src/nat/gnunet-nat.c
index 5012d6455..0743a478d 100644
--- a/src/nat/gnunet-nat.c
+++ b/src/nat/gnunet-nat.c
@@ -392,15 +392,15 @@ run (void *cls,
                                            &stun_read_task,
                                            NULL);
   }
-  GNUNET_free_non_null (remote_sa);
-  GNUNET_free_non_null (local_sa);
+  GNUNET_free (remote_sa);
+  GNUNET_free (local_sa);
   test_finished ();
   return;
 fail_and_shutdown:
   global_ret = 1;
   GNUNET_SCHEDULER_shutdown ();
-  GNUNET_free_non_null (remote_sa);
-  GNUNET_free_non_null (local_sa);
+  GNUNET_free (remote_sa);
+  GNUNET_free (local_sa);
 }
 
 
diff --git a/src/nat/gnunet-service-nat.c b/src/nat/gnunet-service-nat.c
index 3b7d48c82..4dcc0312f 100644
--- a/src/nat/gnunet-service-nat.c
+++ b/src/nat/gnunet-service-nat.c
@@ -2009,7 +2009,7 @@ client_disconnect_cb (void *cls,
       ch->caddrs[i].mh = NULL;
     }
   }
-  GNUNET_free_non_null (ch->caddrs);
+  GNUNET_free (ch->caddrs);
   while (NULL != (lal = ch->ext_addr_head))
   {
     GNUNET_CONTAINER_DLL_remove (ch->ext_addr_head,
@@ -2032,8 +2032,8 @@ client_disconnect_cb (void *cls,
     GNUNET_RESOLVER_request_cancel (ch->ext_dns);
     ch->ext_dns = NULL;
   }
-  GNUNET_free_non_null (ch->hole_external);
-  GNUNET_free_non_null (ch->section_name);
+  GNUNET_free (ch->hole_external);
+  GNUNET_free (ch->section_name);
   GNUNET_free (ch);
 }
 
diff --git a/src/nat/gnunet-service-nat_helper.c b/src/nat/gnunet-service-nat_helper.c
index 58d7b4c61..bd1645d25 100644
--- a/src/nat/gnunet-service-nat_helper.c
+++ b/src/nat/gnunet-service-nat_helper.c
@@ -222,7 +222,7 @@ restart_nat_server (void *cls)
     return;
   }
   h->server_stdout =
-    GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_NO, GNUNET_YES);
+    GNUNET_DISK_pipe (GNUNET_DISK_PF_BLOCKING_RW);
   if (NULL == h->server_stdout)
   {
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "pipe");
@@ -234,8 +234,7 @@ restart_nat_server (void *cls)
               "Starting `%s' at `%s'\n",
               "gnunet-helper-nat-server",
               ia);
-  h->server_proc = GNUNET_OS_start_process (GNUNET_NO,
-                                            0,
+  h->server_proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_NONE,
                                             NULL,
                                             h->server_stdout,
                                             NULL,
@@ -378,8 +377,7 @@ GN_request_connection_reversal (const struct in_addr *internal_address,
               remv4,
               internal_port);
   binary = GNUNET_OS_get_suid_binary_path (cfg, "gnunet-helper-nat-client");
-  proc = GNUNET_OS_start_process (GNUNET_NO,
-                                  0,
+  proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_NONE,
                                   NULL,
                                   NULL,
                                   NULL,
diff --git a/src/nat/gnunet-service-nat_mini.c b/src/nat/gnunet-service-nat_mini.c
index ae94e3f5b..24f77d9cc 100644
--- a/src/nat/gnunet-service-nat_mini.c
+++ b/src/nat/gnunet-service-nat_mini.c
@@ -192,15 +192,14 @@ GNUNET_NAT_mini_get_external_ipv4_ (GNUNET_NAT_IPCallback cb, void *cb_cls)
   }
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Running `external-ip' to determine our external IP\n");
-  eh->opipe = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_NO, GNUNET_YES);
+  eh->opipe = GNUNET_DISK_pipe (GNUNET_DISK_PF_BLOCKING_RW);
   if (NULL == eh->opipe)
   {
     eh->ret = GNUNET_NAT_ERROR_IPC_FAILURE;
     eh->task = GNUNET_SCHEDULER_add_now (&signal_external_ip_error, eh);
     return eh;
   }
-  eh->eip = GNUNET_OS_start_process (GNUNET_NO,
-                                     0,
+  eh->eip = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_NONE,
                                      NULL,
                                      eh->opipe,
                                      NULL,
diff --git a/src/nat/test_nat.c b/src/nat/test_nat.c
index 69a2f4218..a3072f712 100644
--- a/src/nat/test_nat.c
+++ b/src/nat/test_nat.c
@@ -108,7 +108,7 @@ process_if (void *cls,
 
   if (addr == NULL)
     return GNUNET_OK;
-  GNUNET_free_non_null (data->addr);
+  GNUNET_free (data->addr);
   data->addr = GNUNET_malloc (addrlen);
   GNUNET_memcpy (data->addr, addr, addrlen);
   data->addrlen = addrlen;
diff --git a/src/nat/test_nat_test.c b/src/nat/test_nat_test.c
index 43998c97c..2abab4d5f 100644
--- a/src/nat/test_nat_test.c
+++ b/src/nat/test_nat_test.c
@@ -117,8 +117,8 @@ main (int argc, char *const argv[])
     return 0;
   }
 
-  gns = GNUNET_OS_start_process (GNUNET_YES,
-                                 GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+  gns = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR
+                                 | GNUNET_OS_USE_PIPE_CONTROL,
                                  NULL, NULL, NULL,
                                  "gnunet-nat-server",
                                  "gnunet-nat-server",
diff --git a/src/nat/test_stun.c b/src/nat/test_stun.c
index a41734af1..75eb877b3 100644
--- a/src/nat/test_stun.c
+++ b/src/nat/test_stun.c
@@ -277,8 +277,8 @@ main (int argc, char *const argv[])
 
   /* Lets start resolver */
   fn = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver");
-  proc = GNUNET_OS_start_process (GNUNET_YES,
-                                  GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+  proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR
+                                  | GNUNET_OS_USE_PIPE_CONTROL,
                                   NULL, NULL, NULL,
                                   fn,
                                   "gnunet-service-resolver",
diff --git a/src/peerinfo-tool/Makefile.am b/src/peerinfo-tool/Makefile.am
index dfcdcd3da..74af5890b 100644
--- a/src/peerinfo-tool/Makefile.am
+++ b/src/peerinfo-tool/Makefile.am
@@ -21,10 +21,19 @@ libgnunet_plugin_rest_peerinfo_la_LIBADD = \
   $(top_builddir)/src/hello/libgnunethello.la \
   $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
   $(top_builddir)/src/transport/libgnunettransport.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
   $(top_builddir)/src/rest/libgnunetrest.la \
   $(top_builddir)/src/json/libgnunetjson.la \
   $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
   $(LTLIBINTL) -ljansson $(MHD_LIBS)
+libgnunet_plugin_rest_peerinfo_la_DEPENDENCIES = \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/peerinfo/libgnunetpeerinfo.la \
+  $(top_builddir)/src/transport/libgnunettransport.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/rest/libgnunetrest.la \
+  $(top_builddir)/src/json/libgnunetjson.la \
+  $(top_builddir)/src/util/libgnunetutil.la
 libgnunet_plugin_rest_peerinfo_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 libgnunet_plugin_rest_peerinfo_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
diff --git a/src/peerinfo-tool/gnunet-peerinfo.c b/src/peerinfo-tool/gnunet-peerinfo.c
index df6c169b5..739249a93 100644
--- a/src/peerinfo-tool/gnunet-peerinfo.c
+++ b/src/peerinfo-tool/gnunet-peerinfo.c
@@ -249,7 +249,7 @@ dump_pc (struct PrintContext *pc)
     }
   }
   printf ("\n");
-  GNUNET_free_non_null (pc->address_list);
+  GNUNET_free (pc->address_list);
   GNUNET_CONTAINER_DLL_remove (pc_head, pc_tail, pc);
   GNUNET_free (pc);
   if ((NULL == pc_head) && (NULL == pic))
@@ -619,14 +619,14 @@ shutdown_task (void *cls)
     for (i = 0; i < pc->address_list_size; i++)
     {
       ar = &pc->address_list[i];
-      GNUNET_free_non_null (ar->result);
+      GNUNET_free (ar->result);
       if (NULL != ar->atsc)
       {
         GNUNET_TRANSPORT_address_to_string_cancel (ar->atsc);
         ar->atsc = NULL;
       }
     }
-    GNUNET_free_non_null (pc->address_list);
+    GNUNET_free (pc->address_list);
     GNUNET_free (pc);
   }
   GPI_plugins_unload ();
diff --git a/src/peerinfo-tool/plugin_rest_peerinfo.c b/src/peerinfo-tool/plugin_rest_peerinfo.c
index 514b14313..1ab6d6f75 100644
--- a/src/peerinfo-tool/plugin_rest_peerinfo.c
+++ b/src/peerinfo-tool/plugin_rest_peerinfo.c
@@ -359,7 +359,7 @@ peerinfo_list_finished (void *cls)
   resp = GNUNET_REST_create_response (result_str);
   MHD_add_response_header (resp, "Content-Type", "application/json");
   handle->proc (handle->proc_cls, resp, MHD_HTTP_OK);
-  GNUNET_free_non_null (result_str);
+  GNUNET_free (result_str);
   GNUNET_SCHEDULER_add_now (&cleanup_handle, handle);
 }
 
@@ -452,7 +452,7 @@ dump_pc (struct PrintContext *pc)
   json_decref (temp_array);
   json_decref (response_entry);
 
-  GNUNET_free_non_null (pc->address_list);
+  GNUNET_free (pc->address_list);
   GNUNET_CONTAINER_DLL_remove (pc_head,
                                pc_tail,
                                pc);
@@ -813,7 +813,7 @@ libgnunet_plugin_rest_peerinfo_done (void *cls)
 
   plugin->cfg = NULL;
 
-  GNUNET_free_non_null (allow_methods);
+  GNUNET_free (allow_methods);
   GNUNET_free (api);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Peerinfo REST plugin is finished\n");
diff --git a/src/peerinfo/gnunet-service-peerinfo.c b/src/peerinfo/gnunet-service-peerinfo.c
index 27e0337ee..79af90dd4 100644
--- a/src/peerinfo/gnunet-service-peerinfo.c
+++ b/src/peerinfo/gnunet-service-peerinfo.c
@@ -443,8 +443,8 @@ add_host_to_known_hosts (const struct GNUNET_PeerIdentity *identity)
         update_hello (identity, r.hello);
       if (NULL != r.friend_only_hello)
         update_hello (identity, r.friend_only_hello);
-      GNUNET_free_non_null (r.hello);
-      GNUNET_free_non_null (r.friend_only_hello);
+      GNUNET_free (r.hello);
+      GNUNET_free (r.friend_only_hello);
       GNUNET_free (fn);
     }
   }
@@ -825,7 +825,7 @@ update_hello (const struct GNUNET_PeerIdentity *peer,
       GNUNET_free (buffer);
     }
   }
-  GNUNET_free_non_null (fn);
+  GNUNET_free (fn);
   notify_all (host);
 }
 
@@ -982,7 +982,7 @@ discard_hosts_helper (void *cls, const char *fn)
       write_pos += new_hello_size;
     }
     read_pos += cur_hello_size;
-    GNUNET_free_non_null (new_hello);
+    GNUNET_free (new_hello);
   }
 
   if (0 < write_pos)
@@ -1209,8 +1209,8 @@ free_host_entry (void *cls, const struct GNUNET_PeerIdentity *key, void *value)
 
   (void) cls;
   (void) key;
-  GNUNET_free_non_null (he->hello);
-  GNUNET_free_non_null (he->friend_only_hello);
+  GNUNET_free (he->hello);
+  GNUNET_free (he->friend_only_hello);
   GNUNET_free (he);
   return GNUNET_YES;
 }
diff --git a/src/peerstore/peerstore_api.c b/src/peerstore/peerstore_api.c
index 17f73d70a..db5aee0d5 100644
--- a/src/peerstore/peerstore_api.c
+++ b/src/peerstore/peerstore_api.c
@@ -676,7 +676,7 @@ GNUNET_PEERSTORE_iterate_cancel (struct GNUNET_PEERSTORE_IterateContext *ic)
   {
     GNUNET_CONTAINER_DLL_remove (ic->h->iterate_head, ic->h->iterate_tail, ic);
     GNUNET_free (ic->sub_system);
-    GNUNET_free_non_null (ic->key);
+    GNUNET_free (ic->key);
     GNUNET_free (ic);
   }
   else
diff --git a/src/peerstore/plugin_peerstore_flat.c b/src/peerstore/plugin_peerstore_flat.c
index 5efe9dddc..cc5b8b76b 100644
--- a/src/peerstore/plugin_peerstore_flat.c
+++ b/src/peerstore/plugin_peerstore_flat.c
@@ -450,7 +450,7 @@ database_setup (struct Plugin *plugin)
                          s);
         else
           GNUNET_break (0);
-        GNUNET_free_non_null (o);
+        GNUNET_free (o);
       }
       entry->value_size = GNUNET_STRINGS_base64_decode (value,
                                                         strlen (value),
diff --git a/src/peerstore/plugin_peerstore_sqlite.c b/src/peerstore/plugin_peerstore_sqlite.c
index cf499a5df..ad69efdf4 100644
--- a/src/peerstore/plugin_peerstore_sqlite.c
+++ b/src/peerstore/plugin_peerstore_sqlite.c
@@ -639,7 +639,7 @@ database_shutdown (struct Plugin *plugin)
     LOG_SQLITE (plugin,
                 GNUNET_ERROR_TYPE_ERROR,
                 "sqlite3_close");
-  GNUNET_free_non_null (plugin->fn);
+  GNUNET_free (plugin->fn);
 }
 
 
diff --git a/src/pq/pq_connect.c b/src/pq/pq_connect.c
index 8da273b2b..e3a610922 100644
--- a/src/pq/pq_connect.c
+++ b/src/pq/pq_connect.c
@@ -125,7 +125,7 @@ GNUNET_PQ_connect (const char *config_str,
   GNUNET_PQ_reconnect (db);
   if (NULL == db->conn)
   {
-    GNUNET_free_non_null (db->load_path);
+    GNUNET_free (db->load_path);
     GNUNET_free (db->config_str);
     GNUNET_free (db);
     return NULL;
@@ -162,8 +162,7 @@ apply_patch (struct GNUNET_PQ_Context *db,
               "Applying SQL file `%s' on database %s\n",
               buf,
               db->config_str);
-  psql = GNUNET_OS_start_process (GNUNET_NO,
-                                  GNUNET_OS_INHERIT_STD_NONE,
+  psql = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_NONE,
                                   NULL,
                                   NULL,
                                   NULL,
@@ -495,9 +494,9 @@ GNUNET_PQ_connect_with_cfg (const struct GNUNET_CONFIGURATION_Handle *cfg,
                           load_path,
                           es,
                           ps);
-  GNUNET_free_non_null (load_path);
-  GNUNET_free_non_null (sp);
-  GNUNET_free_non_null (conninfo);
+  GNUNET_free (load_path);
+  GNUNET_free (sp);
+  GNUNET_free (conninfo);
   return db;
 }
 
@@ -511,10 +510,10 @@ GNUNET_PQ_connect_with_cfg (const struct GNUNET_CONFIGURATION_Handle *cfg,
 void
 GNUNET_PQ_disconnect (struct GNUNET_PQ_Context *db)
 {
-  GNUNET_free_non_null (db->es);
-  GNUNET_free_non_null (db->ps);
-  GNUNET_free_non_null (db->load_path);
-  GNUNET_free_non_null (db->config_str);
+  GNUNET_free (db->es);
+  GNUNET_free (db->ps);
+  GNUNET_free (db->load_path);
+  GNUNET_free (db->config_str);
   PQfinish (db->conn);
   GNUNET_free (db);
 }
diff --git a/src/pq/pq_prepare.c b/src/pq/pq_prepare.c
index b7003fb69..63087456f 100644
--- a/src/pq/pq_prepare.c
+++ b/src/pq/pq_prepare.c
@@ -83,7 +83,7 @@ GNUNET_PQ_prepare_statements (struct GNUNET_PQ_Context *db,
     memcpy (&rps[olen],
             ps,
             nlen * sizeof (struct GNUNET_PQ_PreparedStatement));
-    GNUNET_free_non_null (db->ps);
+    GNUNET_free (db->ps);
     db->ps = rps;
   }
 
diff --git a/src/pt/test_gns_vpn.c b/src/pt/test_gns_vpn.c
index 69afca789..cf0455477 100644
--- a/src/pt/test_gns_vpn.c
+++ b/src/pt/test_gns_vpn.c
@@ -194,7 +194,7 @@ do_shutdown (void *cls)
     GNUNET_NAMESTORE_disconnect (namestore);
     namestore = NULL;
   }
-  GNUNET_free_non_null (url);
+  GNUNET_free (url);
   url = NULL;
 }
 
diff --git a/src/pt/test_gnunet_vpn.c b/src/pt/test_gnunet_vpn.c
index cb9bb61fe..8ffadeca4 100644
--- a/src/pt/test_gnunet_vpn.c
+++ b/src/pt/test_gnunet_vpn.c
@@ -165,7 +165,7 @@ do_shutdown (void *cls)
     GNUNET_VPN_disconnect (vpn);
     vpn = NULL;
   }
-  GNUNET_free_non_null (url);
+  GNUNET_free (url);
   url = NULL;
 }
 
diff --git a/src/reclaim/Makefile.am b/src/reclaim/Makefile.am
index b6d73bdf7..a9829c47e 100644
--- a/src/reclaim/Makefile.am
+++ b/src/reclaim/Makefile.am
@@ -51,10 +51,19 @@ libgnunet_plugin_rest_reclaim_la_LIBADD = \
   $(top_builddir)/src/identity/libgnunetidentity.la \
   libgnunetreclaim.la \
   $(top_builddir)/src/json/libgnunetjson.la \
+  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
   $(top_builddir)/src/rest/libgnunetrest.la \
   $(top_builddir)/src/namestore/libgnunetnamestore.la \
   $(top_builddir)/src/util/libgnunetutil.la $(XLIBS) \
   $(LTLIBINTL) -ljansson $(MHD_LIBS)
+libgnunet_plugin_rest_reclaim_la_DEPENDENCIES = \
+  $(top_builddir)/src/identity/libgnunetidentity.la \
+  libgnunetreclaim.la \
+  $(top_builddir)/src/json/libgnunetjson.la \
+  $(top_builddir)/src/gnsrecord/libgnunetgnsrecord.la \
+  $(top_builddir)/src/rest/libgnunetrest.la \
+  $(top_builddir)/src/namestore/libgnunetnamestore.la \
+  $(top_builddir)/src/util/libgnunetutil.la
 libgnunet_plugin_rest_reclaim_la_LDFLAGS = \
   $(GN_PLUGIN_LDFLAGS)
 libgnunet_plugin_rest_reclaim_la_CFLAGS = $(MHD_CFLAGS) $(AM_CFLAGS)
diff --git a/src/reclaim/gnunet-reclaim.c b/src/reclaim/gnunet-reclaim.c
index e7ee814b6..6bef5b6fe 100644
--- a/src/reclaim/gnunet-reclaim.c
+++ b/src/reclaim/gnunet-reclaim.c
@@ -313,7 +313,7 @@ process_attrs (void *cls,
            attr->flag,
            id,
            (NULL == attest) ? "" : "(ATTESTED)");
-  GNUNET_free_non_null (value_str);
+  GNUNET_free (value_str);
   GNUNET_free (id);
 }
 
diff --git a/src/reclaim/gnunet-service-reclaim_tickets.c b/src/reclaim/gnunet-service-reclaim_tickets.c
index 205886c78..7e6b07514 100644
--- a/src/reclaim/gnunet-service-reclaim_tickets.c
+++ b/src/reclaim/gnunet-service-reclaim_tickets.c
@@ -971,7 +971,7 @@ cleanup_cth (struct RECLAIM_TICKETS_ConsumeHandle *cth)
   {
     if (NULL != lu->lookup_request)
       GNUNET_GNS_lookup_cancel (lu->lookup_request);
-    GNUNET_free_non_null (lu->label);
+    GNUNET_free (lu->label);
     GNUNET_CONTAINER_DLL_remove (cth->parallel_lookups_head,
                                  cth->parallel_lookups_tail,
                                  lu);
@@ -1292,7 +1292,7 @@ issue_ticket (struct TicketIssueHandle *ih)
   for (le = ih->attrs->list_head; NULL != le; le = le->next)
     attrs_count++;
 
-  //Worst case we have one attestation per attribute
+  // Worst case we have one attestation per attribute
   attrs_record =
     GNUNET_malloc (2 * attrs_count * sizeof(struct GNUNET_GNSRECORD_Data));
   i = 0;
diff --git a/src/reclaim/json_reclaim.h b/src/reclaim/json_reclaim.h
index 61ddb4378..c57971dcb 100644
--- a/src/reclaim/json_reclaim.h
+++ b/src/reclaim/json_reclaim.h
@@ -56,4 +56,3 @@ GNUNET_RECLAIM_JSON_spec_ticket (struct GNUNET_RECLAIM_Ticket **ticket);
 struct GNUNET_JSON_Specification
 GNUNET_RECLAIM_JSON_spec_claim_attest (struct
                                        GNUNET_RECLAIM_Attestation **attr);
-
diff --git a/src/reclaim/oidc_helper.c b/src/reclaim/oidc_helper.c
index e309ed01d..ad2839200 100644
--- a/src/reclaim/oidc_helper.c
+++ b/src/reclaim/oidc_helper.c
@@ -616,7 +616,7 @@ OIDC_parse_authz_code (const struct GNUNET_CRYPTO_EcdsaPrivateKey *ecdsa_priv,
       + sizeof(struct GNUNET_CRYPTO_EcdsaSignature))
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Authorization code malformed\n");
-    GNUNET_free_non_null (code_payload);
+    GNUNET_free (code_payload);
     return GNUNET_SYSERR;
   }
 
@@ -646,7 +646,7 @@ OIDC_parse_authz_code (const struct GNUNET_CRYPTO_EcdsaPrivateKey *ecdsa_priv,
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Expected code verifier!\n");
-      GNUNET_free_non_null (code_payload);
+      GNUNET_free (code_payload);
       return GNUNET_SYSERR;
     }
     code_verifier_hash = GNUNET_malloc (256 / 8);
@@ -669,7 +669,7 @@ OIDC_parse_authz_code (const struct GNUNET_CRYPTO_EcdsaPrivateKey *ecdsa_priv,
                   expected_code_challenge,
                   code_challenge_len,
                   code_challenge);
-      GNUNET_free_non_null (code_payload);
+      GNUNET_free (code_payload);
       GNUNET_free (expected_code_challenge);
       return GNUNET_SYSERR;
     }
diff --git a/src/reclaim/plugin_reclaim_attribute_basic.c b/src/reclaim/plugin_reclaim_attribute_basic.c
index 47fdd5f11..286186a93 100644
--- a/src/reclaim/plugin_reclaim_attribute_basic.c
+++ b/src/reclaim/plugin_reclaim_attribute_basic.c
@@ -90,6 +90,7 @@ basic_string_to_value (void *cls,
   }
 }
 
+
 /**
  * Mapping of attribute type numbers to human-readable
  * attribute type names.
diff --git a/src/reclaim/plugin_rest_openid_connect.c b/src/reclaim/plugin_rest_openid_connect.c
index 563bdd749..36ae937c1 100644
--- a/src/reclaim/plugin_rest_openid_connect.c
+++ b/src/reclaim/plugin_rest_openid_connect.c
@@ -557,12 +557,12 @@ cleanup_handle (struct RequestHandle *handle)
     GNUNET_RECLAIM_cancel (handle->idp_op);
   if (NULL != handle->idp)
     GNUNET_RECLAIM_disconnect (handle->idp);
-  GNUNET_free_non_null (handle->url);
-  GNUNET_free_non_null (handle->tld);
-  GNUNET_free_non_null (handle->redirect_prefix);
-  GNUNET_free_non_null (handle->redirect_suffix);
-  GNUNET_free_non_null (handle->emsg);
-  GNUNET_free_non_null (handle->edesc);
+  GNUNET_free (handle->url);
+  GNUNET_free (handle->tld);
+  GNUNET_free (handle->redirect_prefix);
+  GNUNET_free (handle->redirect_suffix);
+  GNUNET_free (handle->emsg);
+  GNUNET_free (handle->edesc);
   if (NULL != handle->gns_op)
     GNUNET_GNS_lookup_cancel (handle->gns_op);
   if (NULL != handle->gns_handle)
@@ -572,13 +572,13 @@ cleanup_handle (struct RequestHandle *handle)
     GNUNET_NAMESTORE_disconnect (handle->namestore_handle);
   if (NULL != handle->oidc)
   {
-    GNUNET_free_non_null (handle->oidc->client_id);
-    GNUNET_free_non_null (handle->oidc->login_identity);
-    GNUNET_free_non_null (handle->oidc->nonce);
-    GNUNET_free_non_null (handle->oidc->redirect_uri);
-    GNUNET_free_non_null (handle->oidc->response_type);
-    GNUNET_free_non_null (handle->oidc->scope);
-    GNUNET_free_non_null (handle->oidc->state);
+    GNUNET_free (handle->oidc->client_id);
+    GNUNET_free (handle->oidc->login_identity);
+    GNUNET_free (handle->oidc->nonce);
+    GNUNET_free (handle->oidc->redirect_uri);
+    GNUNET_free (handle->oidc->response_type);
+    GNUNET_free (handle->oidc->scope);
+    GNUNET_free (handle->oidc->state);
     json_decref (handle->oidc->response);
     GNUNET_free (handle->oidc);
   }
@@ -594,8 +594,8 @@ cleanup_handle (struct RequestHandle *handle)
     GNUNET_CONTAINER_DLL_remove (handle->ego_head,
                                  handle->ego_tail,
                                  ego_entry);
-    GNUNET_free_non_null (ego_entry->identifier);
-    GNUNET_free_non_null (ego_entry->keystring);
+    GNUNET_free (ego_entry->identifier);
+    GNUNET_free (ego_entry->keystring);
     GNUNET_free (ego_entry);
   }
   GNUNET_free (handle);
@@ -1734,7 +1734,7 @@ login_cont (struct GNUNET_REST_RequestHandle *con_handle,
                                      OIDC_COOKIE_EXPIRATION));
     last_time =
       GNUNET_CONTAINER_multihashmap_get (OIDC_cookie_jar_map, &cache_key);
-    GNUNET_free_non_null (last_time);
+    GNUNET_free (last_time);
     GNUNET_CONTAINER_multihashmap_put (OIDC_cookie_jar_map,
                                        &cache_key,
                                        current_time,
@@ -1804,7 +1804,7 @@ check_authorization (struct RequestHandle *handle,
   client_id = strtok (basic_authorization, ":");
   if (NULL == client_id)
   {
-    GNUNET_free_non_null (basic_authorization);
+    GNUNET_free (basic_authorization);
     handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_CLIENT);
     handle->response_code = MHD_HTTP_UNAUTHORIZED;
     return GNUNET_SYSERR;
@@ -1812,7 +1812,7 @@ check_authorization (struct RequestHandle *handle,
   pass = strtok (NULL, ":");
   if (NULL == pass)
   {
-    GNUNET_free_non_null (basic_authorization);
+    GNUNET_free (basic_authorization);
     handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_CLIENT);
     handle->response_code = MHD_HTTP_UNAUTHORIZED;
     return GNUNET_SYSERR;
@@ -1826,7 +1826,7 @@ check_authorization (struct RequestHandle *handle,
   {
     if (0 != strcmp (expected_pass, pass))
     {
-      GNUNET_free_non_null (basic_authorization);
+      GNUNET_free (basic_authorization);
       GNUNET_free (expected_pass);
       handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_CLIENT);
       handle->response_code = MHD_HTTP_UNAUTHORIZED;
@@ -1836,7 +1836,7 @@ check_authorization (struct RequestHandle *handle,
   }
   else
   {
-    GNUNET_free_non_null (basic_authorization);
+    GNUNET_free (basic_authorization);
     handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_SERVER_ERROR);
     handle->edesc = GNUNET_strdup ("gnunet configuration failed");
     handle->response_code = MHD_HTTP_INTERNAL_SERVER_ERROR;
@@ -1852,7 +1852,7 @@ check_authorization (struct RequestHandle *handle,
   }
   if (NULL == handle->ego_entry)
   {
-    GNUNET_free_non_null (basic_authorization);
+    GNUNET_free (basic_authorization);
     handle->emsg = GNUNET_strdup (OIDC_ERROR_KEY_INVALID_CLIENT);
     handle->response_code = MHD_HTTP_UNAUTHORIZED;
     return GNUNET_SYSERR;
@@ -2504,7 +2504,7 @@ libgnunet_plugin_rest_openid_connect_done (void *cls)
   while (GNUNET_YES ==
          GNUNET_CONTAINER_multihashmap_iterator_next (hashmap_it, NULL,
                                                       value))
-    GNUNET_free_non_null (value);
+    GNUNET_free (value);
   GNUNET_CONTAINER_multihashmap_iterator_destroy (hashmap_it);
   GNUNET_CONTAINER_multihashmap_destroy (OIDC_cookie_jar_map);
 
@@ -2513,10 +2513,10 @@ libgnunet_plugin_rest_openid_connect_done (void *cls)
   while (GNUNET_YES ==
          GNUNET_CONTAINER_multihashmap_iterator_next (hashmap_it, NULL,
                                                       value))
-    GNUNET_free_non_null (value);
+    GNUNET_free (value);
   GNUNET_CONTAINER_multihashmap_destroy (OIDC_access_token_map);
   GNUNET_CONTAINER_multihashmap_iterator_destroy (hashmap_it);
-  GNUNET_free_non_null (allow_methods);
+  GNUNET_free (allow_methods);
   GNUNET_free (api);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "OpenID Connect REST plugin is finished\n");
diff --git a/src/reclaim/plugin_rest_reclaim.c b/src/reclaim/plugin_rest_reclaim.c
index 863dd0450..10ee2f801 100644
--- a/src/reclaim/plugin_rest_reclaim.c
+++ b/src/reclaim/plugin_rest_reclaim.c
@@ -576,7 +576,8 @@ attest_collect (void *cls,
   if (GNUNET_OK == GNUNET_RECLAIM_attestation_get_expiration (attest,
                                                               &exp))
   {
-    json_object_set_new (attest_obj, "expiration", json_integer (exp.abs_value_us));
+    json_object_set_new (attest_obj, "expiration", json_integer (
+                           exp.abs_value_us));
   }
   id_str = GNUNET_STRINGS_data_to_string_alloc (&attest->id,
                                                 sizeof(attest->id));
@@ -597,7 +598,7 @@ attest_collect (void *cls,
       json_object_set_new (attr_obj, "name", json_string (
                              ale->attribute->name));
 
-      json_object_set_new (attr_obj, "flag", json_string ("1")); //FIXME
+      json_object_set_new (attr_obj, "flag", json_string ("1")); // FIXME
       type = GNUNET_RECLAIM_attribute_number_to_typename (ale->attribute->type);
       json_object_set_new (attr_obj, "type", json_string (type));
       json_object_set_new (attr_obj, "id", json_string (""));
@@ -1492,7 +1493,7 @@ libgnunet_plugin_rest_reclaim_done (void *cls)
 
   plugin->cfg = NULL;
 
-  GNUNET_free_non_null (allow_methods);
+  GNUNET_free (allow_methods);
   GNUNET_free (api);
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Identity Provider REST plugin is finished\n");
diff --git a/src/reclaim/reclaim_api.c b/src/reclaim/reclaim_api.c
index cfe137949..ff549fa71 100644
--- a/src/reclaim/reclaim_api.c
+++ b/src/reclaim/reclaim_api.c
@@ -658,7 +658,7 @@ handle_consume_ticket_result (void *cls,
     }
     GNUNET_CONTAINER_DLL_remove (h->op_head, h->op_tail, op);
     free_op (op);
-    GNUNET_free_non_null (attrs);
+    GNUNET_free (attrs);
     return;
   }
   GNUNET_assert (0);
diff --git a/src/reclaim/reclaim_attestation.c b/src/reclaim/reclaim_attestation.c
index bdf80a709..1f2b1890b 100644
--- a/src/reclaim/reclaim_attestation.c
+++ b/src/reclaim/reclaim_attestation.c
@@ -552,7 +552,7 @@ GNUNET_RECLAIM_attestation_get_issuer (const struct
 int
 GNUNET_RECLAIM_attestation_get_expiration (const struct
                                            GNUNET_RECLAIM_Attestation *attest,
-                                           struct GNUNET_TIME_Absolute* exp)
+                                           struct GNUNET_TIME_Absolute*exp)
 {
   unsigned int i;
   struct Plugin *plugin;
diff --git a/src/reclaim/reclaim_attribute.c b/src/reclaim/reclaim_attribute.c
index 69c5351d3..05bdc1ac6 100644
--- a/src/reclaim/reclaim_attribute.c
+++ b/src/reclaim/reclaim_attribute.c
@@ -230,7 +230,8 @@ GNUNET_RECLAIM_attribute_value_to_string (uint32_t type,
  */
 struct GNUNET_RECLAIM_Attribute *
 GNUNET_RECLAIM_attribute_new (const char *attr_name,
-                              const struct GNUNET_RECLAIM_Identifier *attestation,
+                              const struct
+                              GNUNET_RECLAIM_Identifier *attestation,
                               uint32_t type,
                               const void *data,
                               size_t data_size)
diff --git a/src/regex/gnunet-regex-profiler.c b/src/regex/gnunet-regex-profiler.c
index 3f8133d61..e82e10e3b 100644
--- a/src/regex/gnunet-regex-profiler.c
+++ b/src/regex/gnunet-regex-profiler.c
@@ -448,9 +448,9 @@ do_shutdown (void *cls)
        search_str_cnt < num_peers && NULL != search_strings;
        search_str_cnt++)
   {
-    GNUNET_free_non_null (search_strings[search_str_cnt]);
+    GNUNET_free (search_strings[search_str_cnt]);
   }
-  GNUNET_free_non_null (search_strings);
+  GNUNET_free (search_strings);
   search_strings = NULL;
 
   if (NULL != reg_handle)
diff --git a/src/regex/gnunet-regex-simulation-profiler.c b/src/regex/gnunet-regex-simulation-profiler.c
index 9adde99bd..3d449a04e 100644
--- a/src/regex/gnunet-regex-simulation-profiler.c
+++ b/src/regex/gnunet-regex-simulation-profiler.c
@@ -255,7 +255,7 @@ reset_meter (struct ProgressMeter *meter)
 static void
 free_meter (struct ProgressMeter *meter)
 {
-  GNUNET_free_non_null (meter->startup_string);
+  GNUNET_free (meter->startup_string);
   GNUNET_free (meter);
 }
 
diff --git a/src/regex/regex_internal.c b/src/regex/regex_internal.c
index 1dd4f6a97..cd33281e2 100644
--- a/src/regex/regex_internal.c
+++ b/src/regex/regex_internal.c
@@ -168,7 +168,7 @@ state_remove_transition (struct REGEX_INTERNAL_State *state,
   if (transition->from_state != state)
     return;
 
-  GNUNET_free_non_null (transition->label);
+  GNUNET_free (transition->label);
 
   state->transition_count--;
   GNUNET_CONTAINER_DLL_remove (state->transitions_head,
@@ -310,8 +310,8 @@ automaton_destroy_state (struct REGEX_INTERNAL_State *s)
   if (NULL == s)
     return;
 
-  GNUNET_free_non_null (s->name);
-  GNUNET_free_non_null (s->proof);
+  GNUNET_free (s->name);
+  GNUNET_free (s->proof);
   state_set_clear (&s->nfa_set);
   for (t = s->transitions_head; NULL != t; t = next_t)
   {
@@ -658,7 +658,7 @@ sb_realloc (struct StringBuffer *ret, size_t nlen)
   ret->blen = nlen;
   GNUNET_memcpy (ret->abuf, ret->sbuf, ret->slen);
   ret->sbuf = ret->abuf;
-  GNUNET_free_non_null (old);
+  GNUNET_free (old);
 }
 
 
@@ -726,7 +726,7 @@ sb_wrap (struct StringBuffer *ret, const char *format, size_t extra_chars)
                    format,
                    (int) ret->slen,
                    ret->sbuf);
-  GNUNET_free_non_null (ret->abuf);
+  GNUNET_free (ret->abuf);
   ret->abuf = temp;
   ret->sbuf = temp;
   ret->blen = ret->slen + extra_chars + 1;
@@ -1592,8 +1592,8 @@ automaton_create_proofs (struct REGEX_INTERNAL_Automaton *a)
   if ((NULL == R_last) || (NULL == R_cur))
   {
     GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "malloc");
-    GNUNET_free_non_null (R_cur);
-    GNUNET_free_non_null (R_last);
+    GNUNET_free (R_cur);
+    GNUNET_free (R_last);
     return GNUNET_SYSERR;
   }
 
@@ -2159,7 +2159,7 @@ dfa_add_multi_strides_helper (void *cls,
                                     t->to_state);
     }
   }
-  GNUNET_free_non_null (label);
+  GNUNET_free (label);
 }
 
 
@@ -2213,7 +2213,7 @@ REGEX_INTERNAL_dfa_add_multi_strides (struct REGEX_INTERNAL_Context *regex_ctx,
     t_next = t->next;
     state_add_transition (regex_ctx, t->from_state, t->label, t->to_state);
     GNUNET_CONTAINER_DLL_remove (ctx.transitions_head, ctx.transitions_tail, t);
-    GNUNET_free_non_null (t->label);
+    GNUNET_free (t->label);
     GNUNET_free (t);
   }
 
@@ -2361,7 +2361,7 @@ dfa_compress_paths (struct REGEX_INTERNAL_Context *regex_ctx,
     t_next = t->next;
     state_add_transition (regex_ctx, t->from_state, t->label, t->to_state);
     GNUNET_CONTAINER_DLL_remove (transitions_head, transitions_tail, t);
-    GNUNET_free_non_null (t->label);
+    GNUNET_free (t->label);
     GNUNET_free (t);
   }
 
@@ -2972,7 +2972,7 @@ error:
   if (NULL != error_msg)
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s\n", error_msg);
 
-  GNUNET_free_non_null (p);
+  GNUNET_free (p);
 
   while (NULL != (nfa = ctx.stack_head))
   {
@@ -3133,8 +3133,8 @@ REGEX_INTERNAL_automaton_destroy (struct REGEX_INTERNAL_Automaton *a)
   if (NULL == a)
     return;
 
-  GNUNET_free_non_null (a->regex);
-  GNUNET_free_non_null (a->canonical_regex);
+  GNUNET_free (a->regex);
+  GNUNET_free (a->canonical_regex);
 
   for (s = a->states_head; NULL != s; s = next_state)
   {
diff --git a/src/regex/regex_test_lib.c b/src/regex/regex_test_lib.c
index 05001b5d2..58cd8dc10 100644
--- a/src/regex/regex_test_lib.c
+++ b/src/regex/regex_test_lib.c
@@ -222,10 +222,10 @@ regex_combine (struct RegexCombineCtx *ctx)
     else
     {
       GNUNET_asprintf (&tmp, "%s%s|", regex, s);
-      GNUNET_free_non_null (regex);
+      GNUNET_free (regex);
       regex = tmp;
     }
-    GNUNET_free_non_null (s);
+    GNUNET_free (s);
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "  so far '%s' for inner %s\n", regex,
                 ctx->s);
   }
@@ -517,7 +517,7 @@ regex_ctx_destroy (struct RegexCombineCtx *ctx)
   {
     regex_ctx_destroy (ctx->children[i]);
   }
-  GNUNET_free_non_null (ctx->s);  /* 's' on root node is null */
+  GNUNET_free (ctx->s);  /* 's' on root node is null */
   GNUNET_free (ctx->children);
   GNUNET_free (ctx);
 }
@@ -632,7 +632,7 @@ REGEX_TEST_read_from_file (const char *filename)
     regex = NULL;
   }
   while (offset < size);
-  GNUNET_free_non_null (regex);
+  GNUNET_free (regex);
   GNUNET_free (buffer);
 
   return regexes;
diff --git a/src/regex/test_regex_eval_api.c b/src/regex/test_regex_eval_api.c
index 767571156..7cd081269 100644
--- a/src/regex/test_regex_eval_api.c
+++ b/src/regex/test_regex_eval_api.c
@@ -178,9 +178,9 @@ test_random (unsigned int rx_length, unsigned int max_str_len,
   return result;
 
 error:
-  GNUNET_free_non_null (matching_str);
-  GNUNET_free_non_null (rand_rx);
-  GNUNET_free_non_null (canonical_regex);
+  GNUNET_free (matching_str);
+  GNUNET_free (rand_rx);
+  GNUNET_free (canonical_regex);
   return -1;
 }
 
@@ -371,7 +371,7 @@ main (int argc, char *argv[])
     REGEX_INTERNAL_automaton_destroy (a);
     if (0 != check_dfa)
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "check_proof: %s\n", check_proof);
-    GNUNET_free_non_null (check_proof);
+    GNUNET_free (check_proof);
 
     regfree (&rx);
   }
diff --git a/src/rest/gnunet-rest-server.c b/src/rest/gnunet-rest-server.c
index 30eade623..875509536 100644
--- a/src/rest/gnunet-rest-server.c
+++ b/src/rest/gnunet-rest-server.c
@@ -209,7 +209,7 @@ plugin_callback (void *cls, struct MHD_Response *resp, int status)
 static int
 cleanup_url_map (void *cls, const struct GNUNET_HashCode *key, void *value)
 {
-  GNUNET_free_non_null (value);
+  GNUNET_free (value);
   return GNUNET_YES;
 }
 
@@ -728,8 +728,8 @@ do_shutdown (void *cls)
 {
   GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Shutting down...\n");
   kill_httpd ();
-  GNUNET_free_non_null (allow_credentials);
-  GNUNET_free_non_null (allow_headers);
+  GNUNET_free (allow_credentials);
+  GNUNET_free (allow_headers);
 }
 
 
@@ -1055,7 +1055,7 @@ main (int argc, char *const *argv)
         ? 0
         : 1;
   MHD_destroy_response (failure_response);
-  GNUNET_free_non_null ((char *) argv);
+  GNUNET_free_nz ((char *) argv);
   return ret;
 }
 
diff --git a/src/revocation/Makefile.am b/src/revocation/Makefile.am
index 6efd461c1..a90f8cd79 100644
--- a/src/revocation/Makefile.am
+++ b/src/revocation/Makefile.am
@@ -28,8 +28,14 @@ libgnunet_plugin_block_revocation_la_SOURCES = \
 libgnunet_plugin_block_revocation_la_LIBADD = \
   libgnunetrevocation.la \
   $(top_builddir)/src/block/libgnunetblockgroup.la \
+  $(top_builddir)/src/block/libgnunetblock.la \
   $(top_builddir)/src/util/libgnunetutil.la  \
   $(LTLIBINTL)
+libgnunet_plugin_block_revocation_la_DEPENDENCIES = \
+  libgnunetrevocation.la \
+  $(top_builddir)/src/block/libgnunetblockgroup.la \
+  $(top_builddir)/src/block/libgnunetblock.la \
+  $(top_builddir)/src/util/libgnunetutil.la
 libgnunet_plugin_block_revocation_la_LDFLAGS = \
  $(GN_PLUGIN_LDFLAGS)
 
diff --git a/src/revocation/gnunet-revocation-tvg.c b/src/revocation/gnunet-revocation-tvg.c
index b8f462b28..29df1bb4d 100644
--- a/src/revocation/gnunet-revocation-tvg.c
+++ b/src/revocation/gnunet-revocation-tvg.c
@@ -43,13 +43,14 @@ print_bytes (void *buf,
 
   for (i = 0; i < buf_len; i++)
   {
-    if ((0 != i) && (0 != fold) && (i%fold == 0))
-      printf("\n");
-    printf("%02x", ((unsigned char*)buf)[i]);
+    if ((0 != i) && (0 != fold) && (i % fold == 0))
+      printf ("\n");
+    printf ("%02x", ((unsigned char*) buf)[i]);
   }
-  printf("\n");
+  printf ("\n");
 }
 
+
 /**
  * Main function that will be run.
  *
@@ -73,12 +74,12 @@ run (void *cls,
   GNUNET_CRYPTO_ecdsa_key_create (&id_priv);
   GNUNET_CRYPTO_ecdsa_key_get_public (&id_priv,
                                       &id_pub);
-  fprintf(stdout, "Zone private key (d, little-endian scalar):\n");
+  fprintf (stdout, "Zone private key (d, little-endian scalar):\n");
   print_bytes (&id_priv, sizeof(id_priv), 0);
-  fprintf(stdout, "\n");
-  fprintf(stdout, "Zone public key (zk):\n");
+  fprintf (stdout, "\n");
+  fprintf (stdout, "Zone public key (zk):\n");
   print_bytes (&id_pub, sizeof(id_pub), 0);
-  fprintf(stdout, "\n");
+  fprintf (stdout, "\n");
   memset (&pow, 0, sizeof (pow));
   GNUNET_REVOCATION_pow_init (&id_priv,
                               &pow);
@@ -99,7 +100,7 @@ run (void *cls,
   GNUNET_assert (GNUNET_OK == GNUNET_REVOCATION_check_pow (&pow,
                                                            TEST_DIFFICULTY,
                                                            exp));
-  fprintf(stdout, "Proof:\n");
+  fprintf (stdout, "Proof:\n");
   print_bytes (&pow,
                sizeof (pow),
                8);
diff --git a/src/revocation/revocation_api.c b/src/revocation/revocation_api.c
index 3815e47b0..e0b195aa9 100644
--- a/src/revocation/revocation_api.c
+++ b/src/revocation/revocation_api.c
@@ -468,9 +468,9 @@ GNUNET_REVOCATION_check_pow (const struct GNUNET_REVOCATION_PowP *pow,
   /**
    * First, check if PoW set is strictly monotically increasing
    */
-  for (unsigned int i = 0; i < POW_COUNT-1; i++)
+  for (unsigned int i = 0; i < POW_COUNT - 1; i++)
   {
-    if (GNUNET_ntohll (pow->pow[i]) >= GNUNET_ntohll (pow->pow[i+1]))
+    if (GNUNET_ntohll (pow->pow[i]) >= GNUNET_ntohll (pow->pow[i + 1]))
       return GNUNET_NO;
   }
   GNUNET_memcpy (&buf[sizeof(uint64_t)],
@@ -592,6 +592,7 @@ GNUNET_REVOCATION_pow_start (struct GNUNET_REVOCATION_PowP *pow,
   return pc;
 }
 
+
 /**
  * Comparison function for quicksort
  *
@@ -602,9 +603,10 @@ GNUNET_REVOCATION_pow_start (struct GNUNET_REVOCATION_PowP *pow,
 static int
 cmp_pow_value (const void *a, const void *b)
 {
-  return ( GNUNET_ntohll(*(uint64_t*)a) - GNUNET_ntohll(*(uint64_t*)b));
+  return (GNUNET_ntohll (*(uint64_t*) a) - GNUNET_ntohll (*(uint64_t*) b));
 }
 
+
 /**
  * Calculate a key revocation valid for broadcasting for a number
  * of epochs.
diff --git a/src/revocation/test_revocation.c b/src/revocation/test_revocation.c
index 1c2efa60f..b65567d79 100644
--- a/src/revocation/test_revocation.c
+++ b/src/revocation/test_revocation.c
@@ -141,11 +141,11 @@ revocation_cb (void *cls, enum GNUNET_GenericReturnValue is_valid)
   }
 }
 
-struct GNUNET_REVOCATION_Pow proof_of_work;
 
+static struct GNUNET_REVOCATION_PowP proof_of_work;
 
 static void
-ego_cb (void *cls, const struct GNUNET_IDENTITY_Ego *ego)
+ego_cb (void *cls, struct GNUNET_IDENTITY_Ego *ego)
 {
   static int completed = 0;
   const struct GNUNET_CRYPTO_EcdsaPrivateKey *privkey;
diff --git a/src/rps/gnunet-rps-profiler.c b/src/rps/gnunet-rps-profiler.c
index af43a0fa1..08d1d2d34 100644
--- a/src/rps/gnunet-rps-profiler.c
+++ b/src/rps/gnunet-rps-profiler.c
@@ -924,10 +924,10 @@ tofile_ (const char *file_name, const char *line)
     int size; \
     size = GNUNET_snprintf (tmp_buf, sizeof(tmp_buf), __VA_ARGS__); \
     if (0 > size) \
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, \
-                  "Failed to create tmp_buf\n"); \
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, \
+                "Failed to create tmp_buf\n"); \
     else \
-      tofile_ (file_name, tmp_buf); \
+    tofile_ (file_name, tmp_buf); \
 } while (0);
 
 
diff --git a/src/rps/rps_api.c b/src/rps/rps_api.c
index da24ca4c9..8b69dae96 100644
--- a/src/rps/rps_api.c
+++ b/src/rps/rps_api.c
@@ -674,7 +674,7 @@ handle_stream_input (void *cls,
   // peers = (struct GNUNET_PeerIdentity *) &msg[1];
   num_peers = ntohl (msg->num_peers);
   srh_callback_num_peers = num_peers;
-  GNUNET_free_non_null (srh_callback_peers);
+  GNUNET_free (srh_callback_peers);
   srh_callback_peers = GNUNET_new_array (num_peers,
                                          struct GNUNET_PeerIdentity);
   GNUNET_memcpy (srh_callback_peers,
diff --git a/src/rps/test_rps.c b/src/rps/test_rps.c
index 81cf63c72..a7dc3aa00 100644
--- a/src/rps/test_rps.c
+++ b/src/rps/test_rps.c
@@ -656,10 +656,10 @@ tofile_ (const char *file_name, const char *line)
     int size; \
     size = GNUNET_snprintf (tmp_buf, sizeof(tmp_buf), __VA_ARGS__); \
     if (0 > size) \
-      GNUNET_log (GNUNET_ERROR_TYPE_WARNING, \
-                  "Failed to create tmp_buf\n"); \
+    GNUNET_log (GNUNET_ERROR_TYPE_WARNING, \
+                "Failed to create tmp_buf\n"); \
     else \
-      tofile_ (file_name, tmp_buf); \
+    tofile_ (file_name, tmp_buf); \
 } while (0);
 
 
diff --git a/src/set/gnunet-service-set.c b/src/set/gnunet-service-set.c
index 8b46f68de..2b859d81a 100644
--- a/src/set/gnunet-service-set.c
+++ b/src/set/gnunet-service-set.c
@@ -492,7 +492,7 @@ destroy_elements_iterator (void *cls,
 {
   struct ElementEntry *ee = value;
 
-  GNUNET_free_non_null (ee->mutations);
+  GNUNET_free (ee->mutations);
   GNUNET_free (ee);
   return GNUNET_YES;
 }
@@ -570,7 +570,7 @@ client_disconnect_cb (void *cls,
       content->elements = NULL;
       GNUNET_free (content);
     }
-    GNUNET_free_non_null (set->excluded_generations);
+    GNUNET_free (set->excluded_generations);
     set->excluded_generations = NULL;
 
     /* remove set from pending copy requests */
diff --git a/src/set/gnunet-service-set_intersection.c b/src/set/gnunet-service-set_intersection.c
index 993cead11..9313483bb 100644
--- a/src/set/gnunet-service-set_intersection.c
+++ b/src/set/gnunet-service-set_intersection.c
@@ -868,7 +868,7 @@ process_bf (struct Operation *op)
                   GNUNET_CONTAINER_multihashmap_size (op->state->my_elements));
       op->state->full_result_iter
         = GNUNET_CONTAINER_multihashmap_iterator_create (
-        op->state->my_elements);
+            op->state->my_elements);
       send_remaining_elements (op);
       return;
     }
diff --git a/src/set/gnunet-service-set_union_strata_estimator.c b/src/set/gnunet-service-set_union_strata_estimator.c
index a59dbbd57..97b4a1f98 100644
--- a/src/set/gnunet-service-set_union_strata_estimator.c
+++ b/src/set/gnunet-service-set_union_strata_estimator.c
@@ -120,7 +120,7 @@ strata_estimator_read (const void *buf,
   if (buf_len != se->strata_count * se->ibf_size * IBF_BUCKET_SIZE)
   {
     GNUNET_break (0);  /* very odd error */
-    GNUNET_free_non_null (dbuf);
+    GNUNET_free (dbuf);
     return GNUNET_SYSERR;
   }
 
@@ -129,7 +129,7 @@ strata_estimator_read (const void *buf,
     ibf_read_slice (buf, 0, se->ibf_size, se->strata[i]);
     buf += se->ibf_size * IBF_BUCKET_SIZE;
   }
-  GNUNET_free_non_null (dbuf);
+  GNUNET_free (dbuf);
   return GNUNET_OK;
 }
 
@@ -149,7 +149,7 @@ strata_estimator_insert (struct StrataEstimator *se,
 
   v = key.key_val;
   /* count trailing '1'-bits of v */
-  for (i = 0; v &1; v >>= 1, i++)
+  for (i = 0; v & 1; v >>= 1, i++)
     /* empty */;
   ibf_insert (se->strata[i], key);
 }
@@ -170,7 +170,7 @@ strata_estimator_remove (struct StrataEstimator *se,
 
   v = key.key_val;
   /* count trailing '1'-bits of v */
-  for (i = 0; v &1; v >>= 1, i++)
+  for (i = 0; v & 1; v >>= 1, i++)
     /* empty */;
   ibf_remove (se->strata[i], key);
 }
diff --git a/src/statistics/gnunet-service-statistics.c b/src/statistics/gnunet-service-statistics.c
index d40f74aaf..31c367e91 100644
--- a/src/statistics/gnunet-service-statistics.c
+++ b/src/statistics/gnunet-service-statistics.c
@@ -290,7 +290,8 @@ save ()
         msg->flags =
           htonl (pos->persistent ? GNUNET_STATISTICS_SETFLAG_PERSISTENT : 0);
         msg->value = GNUNET_htonll (pos->value);
-        if (GNUNET_OK != GNUNET_BIO_write (wh, "statistics-save-msg", msg, size))
+        if (GNUNET_OK != GNUNET_BIO_write (wh, "statistics-save-msg", msg,
+                                           size))
         {
           GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING, "write", fn);
           if (GNUNET_OK != GNUNET_BIO_write_close (wh, NULL))
@@ -319,7 +320,7 @@ save ()
                   total,
                   fn);
   }
-  GNUNET_free_non_null (fn);
+  GNUNET_free (fn);
 }
 
 
diff --git a/src/statistics/gnunet-statistics.c b/src/statistics/gnunet-statistics.c
index 63afde877..b9aedb4e7 100644
--- a/src/statistics/gnunet-statistics.c
+++ b/src/statistics/gnunet-statistics.c
@@ -880,7 +880,7 @@ main (int argc, char *const *argv)
   GNUNET_array_grow (nodes,
                      num_nodes,
                      0);
-  GNUNET_free_non_null (remote_host);
+  GNUNET_free (remote_host);
   GNUNET_free_nz ((void *) argv);
   return ret;
 }
diff --git a/src/statistics/statistics_api.c b/src/statistics/statistics_api.c
index 869d51544..12c09b7d2 100644
--- a/src/statistics/statistics_api.c
+++ b/src/statistics/statistics_api.c
@@ -374,8 +374,8 @@ schedule_watch_request (struct GNUNET_STATISTICS_Handle *h,
 static void
 free_action_item (struct GNUNET_STATISTICS_GetHandle *gh)
 {
-  GNUNET_free_non_null (gh->subsystem);
-  GNUNET_free_non_null (gh->name);
+  GNUNET_free (gh->subsystem);
+  GNUNET_free (gh->name);
   GNUNET_free (gh);
 }
 
diff --git a/src/statistics/test_statistics_api.c b/src/statistics/test_statistics_api.c
index fcdeccad6..c9e568870 100644
--- a/src/statistics/test_statistics_api.c
+++ b/src/statistics/test_statistics_api.c
@@ -197,8 +197,8 @@ main (int argc, char *argv_ign[])
                     NULL);
   binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-statistics");
   proc =
-    GNUNET_OS_start_process (GNUNET_YES,
-                             GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+    GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR
+                             | GNUNET_OS_USE_PIPE_CONTROL,
                              NULL, NULL, NULL,
                              binary,
                              "gnunet-service-statistics",
@@ -225,8 +225,8 @@ main (int argc, char *argv_ign[])
   ok = 1;
   /* restart to check persistence! */
   proc =
-    GNUNET_OS_start_process (GNUNET_YES,
-                             GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+    GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR
+                             | GNUNET_OS_USE_PIPE_CONTROL,
                              NULL, NULL, NULL,
                              binary,
                              "gnunet-service-statistics",
diff --git a/src/statistics/test_statistics_api_loop.c b/src/statistics/test_statistics_api_loop.c
index 50507bdc4..ad273287d 100644
--- a/src/statistics/test_statistics_api_loop.c
+++ b/src/statistics/test_statistics_api_loop.c
@@ -98,7 +98,8 @@ main (int argc, char *argv_ign[])
 
   binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-statistics");
   proc =
-    GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+    GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR
+                             | GNUNET_OS_USE_PIPE_CONTROL,
                              NULL, NULL, NULL,
                              binary,
                              "gnunet-service-statistics",
diff --git a/src/statistics/test_statistics_api_watch.c b/src/statistics/test_statistics_api_watch.c
index 06e639599..2d9d08305 100644
--- a/src/statistics/test_statistics_api_watch.c
+++ b/src/statistics/test_statistics_api_watch.c
@@ -130,7 +130,8 @@ main (int argc, char *argv_ign[])
 
   binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-statistics");
   proc =
-    GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+    GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR
+                             | GNUNET_OS_USE_PIPE_CONTROL,
                              NULL, NULL, NULL,
                              binary,
                              "gnunet-service-statistics",
diff --git a/src/statistics/test_statistics_api_watch_zero_value.c b/src/statistics/test_statistics_api_watch_zero_value.c
index 80ca57c18..cb2694f8f 100644
--- a/src/statistics/test_statistics_api_watch_zero_value.c
+++ b/src/statistics/test_statistics_api_watch_zero_value.c
@@ -168,7 +168,8 @@ main (int argc, char *argv_ign[])
 
   binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-statistics");
   proc =
-    GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+    GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR
+                             | GNUNET_OS_USE_PIPE_CONTROL,
                              NULL, NULL, NULL,
                              binary,
                              "gnunet-service-statistics",
diff --git a/src/testbed-logger/test_testbed_logger_api.c b/src/testbed-logger/test_testbed_logger_api.c
index 7496184c0..085f83d0e 100644
--- a/src/testbed-logger/test_testbed_logger_api.c
+++ b/src/testbed-logger/test_testbed_logger_api.c
@@ -88,7 +88,7 @@ shutdown_now ()
 {
   CANCEL_TASK (abort_task);
   CANCEL_TASK (write_task);
-  GNUNET_free_non_null (search_dir);
+  GNUNET_free (search_dir);
   if (NULL != h)
     GNUNET_TESTBED_LOGGER_disconnect (h);
   GNUNET_SCHEDULER_shutdown ();
diff --git a/src/testbed/Makefile.am b/src/testbed/Makefile.am
index 62b49af78..7c1e217bb 100644
--- a/src/testbed/Makefile.am
+++ b/src/testbed/Makefile.am
@@ -111,6 +111,12 @@ libgnunettestbed_la_LIBADD = $(XLIB) \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(top_builddir)/src/testing/libgnunettesting.la \
  $(LTLIBINTL)
+libgnunettestbed_la_DEPENDENCIES = \
+ $(top_builddir)/src/statistics/libgnunetstatistics.la \
+ $(top_builddir)/src/transport/libgnunettransport.la \
+ $(top_builddir)/src/hello/libgnunethello.la \
+ $(top_builddir)/src/util/libgnunetutil.la \
+ $(top_builddir)/src/testing/libgnunettesting.la
 libgnunettestbed_la_LDFLAGS = \
  $(GN_LIB_LDFLAGS) \
  -version-info 0:0:0
diff --git a/src/testbed/generate-underlay-topology.c b/src/testbed/generate-underlay-topology.c
index 726bed179..97c3c1e67 100644
--- a/src/testbed/generate-underlay-topology.c
+++ b/src/testbed/generate-underlay-topology.c
@@ -51,12 +51,12 @@
                      __LINE__,                                    \
                      sqlite3_errmsg (db));                        \
     if (msg != NULL)                                              \
-      GNUNET_asprintf (msg,                                       \
-                       _ ("`%s' failed at %s:%u with error: %s"), \
-                       cmd,                                       \
-                       __FILE__,                                  \
-                       __LINE__,                                  \
-                       sqlite3_errmsg (db));                      \
+    GNUNET_asprintf (msg,                                       \
+                     _ ("`%s' failed at %s:%u with error: %s"), \
+                     cmd,                                       \
+                     __FILE__,                                  \
+                     __LINE__,                                  \
+                     sqlite3_errmsg (db));                      \
   } while (0)
 
 
diff --git a/src/testbed/gnunet-daemon-latency-logger.c b/src/testbed/gnunet-daemon-latency-logger.c
index c13750db7..cbc9cfdbf 100644
--- a/src/testbed/gnunet-daemon-latency-logger.c
+++ b/src/testbed/gnunet-daemon-latency-logger.c
@@ -53,8 +53,8 @@
                        "`%s' failed at %s:%d with error: %s\n"), \
                      cmd, __FILE__, __LINE__, sqlite3_errmsg (db));  \
     if (msg != NULL)                                                    \
-      GNUNET_asprintf (msg, _ ("`%s' failed at %s:%u with error: %s"), cmd, \
-                       __FILE__, __LINE__, sqlite3_errmsg (db));     \
+    GNUNET_asprintf (msg, _ ("`%s' failed at %s:%u with error: %s"), cmd, \
+                     __FILE__, __LINE__, sqlite3_errmsg (db));     \
   } while (0)
 
 
diff --git a/src/testbed/gnunet-daemon-testbed-underlay.c b/src/testbed/gnunet-daemon-testbed-underlay.c
index 2bff7cdd4..c3b424c9b 100644
--- a/src/testbed/gnunet-daemon-testbed-underlay.c
+++ b/src/testbed/gnunet-daemon-testbed-underlay.c
@@ -57,8 +57,8 @@
                        "`%s' failed at %s:%d with error: %s\n"), \
                      cmd, __FILE__, __LINE__, sqlite3_errmsg (db));  \
     if (msg != NULL)                                                    \
-      GNUNET_asprintf (msg, _ ("`%s' failed at %s:%u with error: %s"), cmd, \
-                       __FILE__, __LINE__, sqlite3_errmsg (db));     \
+    GNUNET_asprintf (msg, _ ("`%s' failed at %s:%u with error: %s"), cmd, \
+                     __FILE__, __LINE__, sqlite3_errmsg (db));     \
   } while (0)
 
 
diff --git a/src/testbed/gnunet-helper-testbed.c b/src/testbed/gnunet-helper-testbed.c
index 4c1637db6..5d0c3b048 100644
--- a/src/testbed/gnunet-helper-testbed.c
+++ b/src/testbed/gnunet-helper-testbed.c
@@ -58,12 +58,6 @@
 
 
 /**
- * We need pipe control only on WINDOWS
- */
-#define PIPE_CONTROL GNUNET_NO
-
-
-/**
  * Context for a single write on a chunk of memory
  */
 struct WriteContext
@@ -405,7 +399,7 @@ tokenizer_cb (void *cls, const struct GNUNET_MessageHeader *message)
     GNUNET_free (evstr);
     evstr = NULL;
   }
-  GNUNET_free_non_null (hostname);
+  GNUNET_free (hostname);
   hostname = NULL;
   GNUNET_assert (NULL != test_system);
   GNUNET_assert (GNUNET_OK ==
@@ -435,8 +429,7 @@ tokenizer_cb (void *cls, const struct GNUNET_MessageHeader *message)
                                             see putenv(): becomes part of envrionment! */
     evstr = NULL;
   }
-  testbed = GNUNET_OS_start_process (PIPE_CONTROL,
-                                     GNUNET_OS_INHERIT_STD_ERR /*verbose? */,
+  testbed = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ERR /*verbose? */,
                                      NULL,
                                      NULL,
                                      NULL,
@@ -594,7 +587,7 @@ main (int argc, char **argv)
 
   status = GNUNET_OK;
   if (NULL ==
-      (sigpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, GNUNET_NO, GNUNET_NO)))
+      (sigpipe = GNUNET_DISK_pipe (GNUNET_DISK_PF_NONE)))
   {
     GNUNET_break (0);
     return 1;
diff --git a/src/testbed/gnunet-service-testbed.c b/src/testbed/gnunet-service-testbed.c
index 21a9d0a51..3ef99ae25 100644
--- a/src/testbed/gnunet-service-testbed.c
+++ b/src/testbed/gnunet-service-testbed.c
@@ -550,8 +550,8 @@ handle_add_host (void *cls,
   GNUNET_strlcpy (hostname, ptr, hostname_length + 1);
   if (NULL == (host_cfg = GNUNET_TESTBED_extract_config_ (&msg->header)))
   {
-    GNUNET_free_non_null (username);
-    GNUNET_free_non_null (hostname);
+    GNUNET_free (username);
+    GNUNET_free (hostname);
     GNUNET_break_op (0);
     GNUNET_SERVICE_client_drop (client);
     return;
@@ -570,7 +570,7 @@ handle_add_host (void *cls,
                                              username,
                                              host_cfg,
                                              ntohs (msg->ssh_port));
-  GNUNET_free_non_null (username);
+  GNUNET_free (username);
   GNUNET_free (hostname);
   GNUNET_CONFIGURATION_destroy (host_cfg);
   if (NULL == host)
@@ -757,17 +757,17 @@ shutdown_task (void *cls)
   for (id = 0; id < GST_host_list_size; id++)
     if (NULL != GST_host_list[id])
       GNUNET_TESTBED_host_destroy (GST_host_list[id]);
-  GNUNET_free_non_null (GST_host_list);
+  GNUNET_free (GST_host_list);
   if (NULL != GST_context)
   {
-    GNUNET_free_non_null (GST_context->master_ip);
+    GNUNET_free (GST_context->master_ip);
     if (NULL != GST_context->system)
       GNUNET_TESTING_system_destroy (GST_context->system,
                                      GNUNET_YES);
     GNUNET_free (GST_context);
     GST_context = NULL;
   }
-  GNUNET_free_non_null (hostname);
+  GNUNET_free (hostname);
   /* Free hello cache */
   GST_cache_clear ();
   GST_connection_pool_destroy ();
diff --git a/src/testbed/gnunet-service-testbed.h b/src/testbed/gnunet-service-testbed.h
index 03955327c..ae477ccb4 100644
--- a/src/testbed/gnunet-service-testbed.h
+++ b/src/testbed/gnunet-service-testbed.h
@@ -498,7 +498,7 @@ extern char *GST_stats_dir;
     GNUNET_assert (size <= accommodate_size);                            \
     growth_size = size;                                                 \
     while (growth_size <= accommodate_size)                             \
-      growth_size += LIST_GROW_STEP;                                    \
+    growth_size += LIST_GROW_STEP;                                    \
     GNUNET_array_grow (ptr, size, growth_size);                         \
     GNUNET_assert (size > accommodate_size);                            \
   } while (0)
diff --git a/src/testbed/gnunet-service-testbed_cache.c b/src/testbed/gnunet-service-testbed_cache.c
index f87f39067..5e74b865a 100644
--- a/src/testbed/gnunet-service-testbed_cache.c
+++ b/src/testbed/gnunet-service-testbed_cache.c
@@ -120,7 +120,7 @@ static void
 free_entry (struct CacheEntry *entry)
 {
   GNUNET_CONTAINER_DLL_remove (cache_head, cache_tail, entry);
-  GNUNET_free_non_null (entry->hello);
+  GNUNET_free (entry->hello);
   GNUNET_free (entry);
 }
 
@@ -261,7 +261,7 @@ GST_cache_add_hello (const unsigned int peer_id,
   entry = cache_lookup (peer_id);
   if (NULL == entry)
     entry = add_entry (peer_id);
-  GNUNET_free_non_null (entry->hello);
+  GNUNET_free (entry->hello);
   entry->hello = GNUNET_copy_message (hello);
 }
 
diff --git a/src/testbed/gnunet-service-testbed_connectionpool.c b/src/testbed/gnunet-service-testbed_connectionpool.c
index 7f9c9fd57..7318971b3 100644
--- a/src/testbed/gnunet-service-testbed_connectionpool.c
+++ b/src/testbed/gnunet-service-testbed_connectionpool.c
@@ -687,7 +687,7 @@ oprelease_get_handle_core (void *cls)
     return;
   GNUNET_CORE_disconnect (entry->handle_core);
   entry->handle_core = NULL;
-  GNUNET_free_non_null (entry->peer_identity);
+  GNUNET_free (entry->peer_identity);
   entry->peer_identity = NULL;
 }
 
diff --git a/src/testbed/gnunet-service-testbed_cpustatus.c b/src/testbed/gnunet-service-testbed_cpustatus.c
index 2d490ba8c..70b865c73 100644
--- a/src/testbed/gnunet-service-testbed_cpustatus.c
+++ b/src/testbed/gnunet-service-testbed_cpustatus.c
@@ -649,7 +649,7 @@ GST_stats_destroy ()
     proc_stat = NULL;
   }
 #elif OSX
-  GNUNET_free_non_null (prev_cpu_load);
+  GNUNET_free (prev_cpu_load);
 #endif
   if (NULL != sample_load_task_id)
   {
diff --git a/src/testbed/gnunet-service-testbed_links.c b/src/testbed/gnunet-service-testbed_links.c
index ee00e4be0..fb25d7bcb 100644
--- a/src/testbed/gnunet-service-testbed_links.c
+++ b/src/testbed/gnunet-service-testbed_links.c
@@ -401,7 +401,7 @@ GST_route_list_clear ()
   for (id = 0; id < route_list_size; id++)
     if (NULL != route_list[id])
       GNUNET_free (route_list[id]);
-  GNUNET_free_non_null (route_list);
+  GNUNET_free (route_list);
   route_list = NULL;
 }
 
@@ -508,7 +508,7 @@ GST_slave_list_clear ()
       continue;
     destroy_slave (slave);
   }
-  GNUNET_free_non_null (GST_slave_list);
+  GNUNET_free (GST_slave_list);
   GST_slave_list = NULL;
 }
 
@@ -1104,7 +1104,7 @@ GST_neighbour_list_clean ()
     GNUNET_free (n);
     neighbour_list[id] = NULL;
   }
-  GNUNET_free_non_null (neighbour_list);
+  GNUNET_free (neighbour_list);
 }
 
 
diff --git a/src/testbed/gnunet-service-testbed_oc.c b/src/testbed/gnunet-service-testbed_oc.c
index 262fcfc00..3d13ac8cc 100644
--- a/src/testbed/gnunet-service-testbed_oc.c
+++ b/src/testbed/gnunet-service-testbed_oc.c
@@ -360,7 +360,7 @@ GST_cleanup_focc (struct ForwardedOverlayConnectContext *focc)
   GNUNET_CONTAINER_DLL_remove (rhc->focc_dll_head,
                                rhc->focc_dll_tail,
                                focc);
-  GNUNET_free_non_null (focc->orig_msg);
+  GNUNET_free (focc->orig_msg);
   GNUNET_free (focc);
 }
 
@@ -536,8 +536,8 @@ cleanup_occ (struct OverlayConnectContext *occ)
 
   LOG_DEBUG ("0x%llx: Cleaning up occ\n",
              occ->op_id);
-  GNUNET_free_non_null (occ->emsg);
-  GNUNET_free_non_null (occ->hello);
+  GNUNET_free (occ->emsg);
+  GNUNET_free (occ->hello);
   if (NULL != occ->send_hello_task)
     GNUNET_SCHEDULER_cancel (occ->send_hello_task);
   if (NULL != occ->cleanup_task)
@@ -727,7 +727,7 @@ overlay_connect_notify (void *cls,
     cleanup_occ_rp2c (&occ->p2ctx.remote);
     break;
   }
-  GNUNET_free_non_null (occ->emsg);
+  GNUNET_free (occ->emsg);
   occ->emsg = NULL;
   send_overlay_connect_success_msg (occ);
   occ->cleanup_task = GNUNET_SCHEDULER_add_now (&do_cleanup_occ,
@@ -758,7 +758,7 @@ occ_cache_get_handle_ats_occ_cb (void *cls,
 
   GNUNET_assert (OCC_TYPE_LOCAL == occ->type);
   GNUNET_assert (NULL != occ->timeout_task);
-  GNUNET_free_non_null (occ->emsg);
+  GNUNET_free (occ->emsg);
   if (NULL == ac)
   {
     GNUNET_asprintf (&occ->emsg,
@@ -842,7 +842,7 @@ occ_hello_sent_cb (void *cls)
   lp2c->ohh = NULL;
 
   GNUNET_assert (NULL == occ->send_hello_task);
-  GNUNET_free_non_null (occ->emsg);
+  GNUNET_free (occ->emsg);
 
   GNUNET_asprintf (&occ->emsg,
                    "0x%llx: Timeout while acquiring ATS of %s from cache",
@@ -1092,7 +1092,7 @@ hello_update_cb (void *cls,
   GST_connection_pool_get_handle_done (occ->cgh_p1th);
   occ->cgh_p1th = NULL;
   occ->p1th_ = NULL;
-  GNUNET_free_non_null (occ->emsg);
+  GNUNET_free (occ->emsg);
   occ->emsg = NULL;
   p2_transport_connect (occ);
 }
@@ -1118,7 +1118,7 @@ p1_transport_connect_cache_callback (void *cls,
 {
   struct OverlayConnectContext *occ = cls;
 
-  GNUNET_free_non_null (occ->emsg);
+  GNUNET_free (occ->emsg);
   occ->emsg = NULL;
   if (NULL == th)
   {
@@ -1166,7 +1166,7 @@ occ_cache_get_handle_core_cb (void *cls,
   const struct GNUNET_MessageHeader *hello;
 
   GNUNET_assert (NULL != occ->timeout_task);
-  GNUNET_free_non_null (occ->emsg);
+  GNUNET_free (occ->emsg);
   if ((NULL == ch) || (NULL == my_identity))
   {
     GNUNET_asprintf (&occ->emsg,
@@ -1249,7 +1249,7 @@ overlay_connect_get_config (void *cls,
   cmsg =
     (const struct GNUNET_TESTBED_PeerConfigurationInformationMessage *) msg;
   occ->other_peer_identity = cmsg->peer_identity;
-  GNUNET_free_non_null (occ->emsg);
+  GNUNET_free (occ->emsg);
   GNUNET_asprintf (&occ->emsg,
                    "0x%llx: Timeout while connecting to CORE of peer with "
                    "id: %u",
@@ -1508,7 +1508,7 @@ p2_controller_connect_cb (void *cls,
                                            &cmsg.header,
                                            &overlay_connect_get_config,
                                            occ);
-  GNUNET_free_non_null (occ->emsg);
+  GNUNET_free (occ->emsg);
   GNUNET_asprintf (&occ->emsg,
                    "0x%llx: Timeout while getting peer identity of peer "
                    "with id: %u",
@@ -1674,7 +1674,7 @@ cleanup_rocc (struct RemoteOverlayConnectCtx *rocc)
   if ((GNUNET_YES == rocc->peer->destroy_flag) &&
       (0 == rocc->peer->reference_cnt))
     GST_destroy_peer (rocc->peer);
-  GNUNET_free_non_null (rocc->hello);
+  GNUNET_free (rocc->hello);
   GNUNET_CONTAINER_DLL_remove (roccq_head,
                                roccq_tail,
                                rocc);
diff --git a/src/testbed/gnunet-service-testbed_peers.c b/src/testbed/gnunet-service-testbed_peers.c
index d3d597d4f..0184635fa 100644
--- a/src/testbed/gnunet-service-testbed_peers.c
+++ b/src/testbed/gnunet-service-testbed_peers.c
@@ -1084,7 +1084,7 @@ handle_peer_reconfigure (void *cls,
     GST_send_operation_success_msg (client,
                                     op_id);
     GNUNET_SERVICE_client_continue (client);
-    GNUNET_free_non_null (emsg);
+    GNUNET_free (emsg);
     return;
   }
   prc = GNUNET_new (struct PeerReconfigureContext);
@@ -1264,7 +1264,7 @@ ret:
   else
     GST_send_operation_success_msg (mctx->client,
                                     mctx->op_id);
-  GNUNET_free_non_null (emsg);
+  GNUNET_free (emsg);
   cleanup_mctx (mctx);
 }
 
@@ -1459,7 +1459,7 @@ GST_destroy_peers ()
     }
     GNUNET_free (peer);
   }
-  GNUNET_free_non_null (GST_peer_list);
+  GNUNET_free (GST_peer_list);
   GST_peer_list = NULL;
   GST_peer_list_size = 0;
 }
diff --git a/src/testbed/gnunet_testbed_mpi_spawn.c b/src/testbed/gnunet_testbed_mpi_spawn.c
index 8b67523a1..577ffbeba 100644
--- a/src/testbed/gnunet_testbed_mpi_spawn.c
+++ b/src/testbed/gnunet_testbed_mpi_spawn.c
@@ -299,8 +299,7 @@ main (int argc, char *argv[])
     GNUNET_break (0);
     return 1;
   }
-  if (NULL == (sigpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO,
-                                           GNUNET_NO, GNUNET_NO)))
+  if (NULL == (sigpipe = GNUNET_DISK_pipe (GNUNET_DISK_PF_NONE)))
   {
     GNUNET_break (0);
     ret = GNUNET_SYSERR;
@@ -321,7 +320,7 @@ main (int argc, char *argv[])
   GNUNET_SIGNAL_handler_uninstall (shc_chld);
   shc_chld = NULL;
   GNUNET_DISK_pipe_close (sigpipe);
-  GNUNET_free_non_null (fn);
+  GNUNET_free (fn);
   if (GNUNET_OK != ret)
     return ret;
   return 0;
diff --git a/src/testbed/test_gnunet_helper_testbed.c b/src/testbed/test_gnunet_helper_testbed.c
index 7c4d4bad5..d4eec0269 100644
--- a/src/testbed/test_gnunet_helper_testbed.c
+++ b/src/testbed/test_gnunet_helper_testbed.c
@@ -88,7 +88,7 @@ do_shutdown (void *cls)
     GNUNET_SCHEDULER_cancel (abort_task);
   if (NULL != helper)
     GNUNET_HELPER_stop (helper, GNUNET_NO);
-  GNUNET_free_non_null (msg);
+  GNUNET_free (msg);
   if (NULL != cfg)
     GNUNET_CONFIGURATION_destroy (cfg);
 }
diff --git a/src/testbed/test_testbed_api.c b/src/testbed/test_testbed_api.c
index dd270df17..49f1d9ae9 100644
--- a/src/testbed/test_testbed_api.c
+++ b/src/testbed/test_testbed_api.c
@@ -163,7 +163,7 @@ do_shutdown (void *cls)
     if (! (cond)) {                                              \
       GNUNET_break (0);                                          \
       if (NULL != abort_task)               \
-        GNUNET_SCHEDULER_cancel (abort_task);                   \
+      GNUNET_SCHEDULER_cancel (abort_task);                   \
       abort_task = NULL;                    \
       GNUNET_SCHEDULER_add_now (do_shutdown, NULL);             \
       ret;                                                   \
diff --git a/src/testbed/test_testbed_api_2peers_1controller.c b/src/testbed/test_testbed_api_2peers_1controller.c
index c854d1ccc..4a8b8a584 100644
--- a/src/testbed/test_testbed_api_2peers_1controller.c
+++ b/src/testbed/test_testbed_api_2peers_1controller.c
@@ -173,7 +173,7 @@ static enum Stage result;
     if (! (cond)) {                                              \
       GNUNET_break (0);                                          \
       if (NULL != abort_task)               \
-        GNUNET_SCHEDULER_cancel (abort_task);                   \
+      GNUNET_SCHEDULER_cancel (abort_task);                   \
       abort_task = NULL;                    \
       GNUNET_SCHEDULER_add_now (do_shutdown, NULL);             \
       return;                                                   \
diff --git a/src/testbed/test_testbed_api_controllerlink.c b/src/testbed/test_testbed_api_controllerlink.c
index 16a3f7b91..784407520 100644
--- a/src/testbed/test_testbed_api_controllerlink.c
+++ b/src/testbed/test_testbed_api_controllerlink.c
@@ -298,7 +298,7 @@ static enum Stage result;
     {                                         \
       GNUNET_break (0);                       \
       if (NULL != abort_task)                 \
-        GNUNET_SCHEDULER_cancel (abort_task); \
+      GNUNET_SCHEDULER_cancel (abort_task); \
       abort_task = NULL;                      \
       GNUNET_SCHEDULER_shutdown ();           \
       return;                                 \
diff --git a/src/testbed/test_testbed_api_peer_reconfiguration.c b/src/testbed/test_testbed_api_peer_reconfiguration.c
index 91955c13d..22dd46b53 100644
--- a/src/testbed/test_testbed_api_peer_reconfiguration.c
+++ b/src/testbed/test_testbed_api_peer_reconfiguration.c
@@ -77,7 +77,7 @@ enum
     if (! (cond)) {                                              \
       GNUNET_break (0);                                          \
       if (NULL != abort_task)               \
-        GNUNET_SCHEDULER_cancel (abort_task);                   \
+      GNUNET_SCHEDULER_cancel (abort_task);                   \
       abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);  \
       ret;                                                      \
     }                                                           \
diff --git a/src/testbed/test_testbed_api_peers_manage_services.c b/src/testbed/test_testbed_api_peers_manage_services.c
index 6d4f8196a..93b0da550 100644
--- a/src/testbed/test_testbed_api_peers_manage_services.c
+++ b/src/testbed/test_testbed_api_peers_manage_services.c
@@ -92,7 +92,7 @@ enum
     if (! (cond)) {                                              \
       GNUNET_break (0);                                          \
       if (NULL != abort_task)               \
-        GNUNET_SCHEDULER_cancel (abort_task);                   \
+      GNUNET_SCHEDULER_cancel (abort_task);                   \
       abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);  \
       ret;                                                      \
     }                                                           \
diff --git a/src/testbed/test_testbed_api_statistics.c b/src/testbed/test_testbed_api_statistics.c
index 2d0e2d6b8..4d42cda6a 100644
--- a/src/testbed/test_testbed_api_statistics.c
+++ b/src/testbed/test_testbed_api_statistics.c
@@ -76,7 +76,7 @@ static unsigned int num_seen_peers;
     if (! (cond)) {                                              \
       GNUNET_break (0);                                          \
       if (NULL != abort_task)               \
-        GNUNET_SCHEDULER_cancel (abort_task);                   \
+      GNUNET_SCHEDULER_cancel (abort_task);                   \
       abort_task = GNUNET_SCHEDULER_add_now (&do_abort, NULL);  \
       ret;                                                      \
     }                                                           \
@@ -198,7 +198,7 @@ main (int argc, char **argv)
                                   NUM_PEERS,
                                   1LL, NULL, NULL,
                                   &test_master, NULL);
-  GNUNET_free_non_null (seen_peers);
+  GNUNET_free (seen_peers);
   if (GNUNET_OK != result)
     return 1;
   return 0;
diff --git a/src/testbed/test_testbed_api_template.conf b/src/testbed/test_testbed_api_template.conf
index 43ae06f81..255c1b766 100644
--- a/src/testbed/test_testbed_api_template.conf
+++ b/src/testbed/test_testbed_api_template.conf
@@ -14,7 +14,7 @@ QUOTA = 1 MB
 DATABASE = heap
 
 [transport]
-PLUGINS = udp
+PLUGINS = tcp
 ACCEPT_FROM6 = ::1;
 ACCEPT_FROM = 127.0.0.1;
 NEIGHBOUR_LIMIT = 50
diff --git a/src/testbed/test_testbed_api_test.c b/src/testbed/test_testbed_api_test.c
index d3fec78d9..aefbd340e 100644
--- a/src/testbed/test_testbed_api_test.c
+++ b/src/testbed/test_testbed_api_test.c
@@ -90,10 +90,10 @@ do_shutdown (void *cls)
     if (! (cond)) {                                                      \
       GNUNET_break (0);                                                  \
       if (NULL != abort_task)                       \
-        GNUNET_SCHEDULER_cancel (abort_task);                           \
+      GNUNET_SCHEDULER_cancel (abort_task);                           \
       abort_task = NULL;                            \
       if (NULL == shutdown_task)                    \
-        shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);   \
+      shutdown_task = GNUNET_SCHEDULER_add_now (&do_shutdown, NULL);   \
       return;                                                           \
     }                                                                   \
 } while (0)
diff --git a/src/testbed/testbed_api.c b/src/testbed/testbed_api.c
index 9fe5bccdc..697783d96 100644
--- a/src/testbed/testbed_api.c
+++ b/src/testbed/testbed_api.c
@@ -1178,7 +1178,7 @@ handle_link_controllers_result (
     LOG_DEBUG ("Not calling callback\n");
   if (NULL != cfg)
     GNUNET_CONFIGURATION_destroy (cfg);
-  GNUNET_free_non_null (emsg);
+  GNUNET_free (emsg);
 }
 
 
@@ -1314,7 +1314,7 @@ handle_barrier_status (void *cls,
     return; /* just initialised; skip cleanup */
 
 cleanup:
-  GNUNET_free_non_null (emsg);
+  GNUNET_free (emsg);
   /**
    * Do not remove the barrier if we did not echo the status back; this is
    * required at the chained testbed controller setup to ensure the only the
@@ -1459,7 +1459,7 @@ oprelease_link_controllers (void *cls)
   case OPC_STATE_FINISHED:
     break;
   }
-  GNUNET_free_non_null (data);
+  GNUNET_free (data);
   GNUNET_free (opc);
 }
 
diff --git a/src/testbed/testbed_api_hosts.c b/src/testbed/testbed_api_hosts.c
index 95463e44d..95a6bf76f 100644
--- a/src/testbed/testbed_api_hosts.c
+++ b/src/testbed/testbed_api_hosts.c
@@ -56,7 +56,7 @@
   do                                                                       \
   {                                                                        \
     if (cond)                                                              \
-      break;                                                               \
+    break;                                                               \
     LOG (GNUNET_ERROR_TYPE_ERROR, "API violation detected: %s\n", errstr); \
     GNUNET_assert (0);                                                     \
   } while (0)
@@ -506,7 +506,7 @@ GNUNET_TESTBED_hosts_load_from_file (
       else
         (void) GNUNET_TESTBED_host_create (hostname, username, cfg, port);
       count++;
-      GNUNET_free_non_null (username);
+      GNUNET_free (username);
       GNUNET_free (hostname);
       buf = &data[offset + 1];
     }
@@ -611,26 +611,27 @@ GNUNET_TESTBED_hosts_load_from_loadleveler (
 void
 GNUNET_TESTBED_host_destroy (struct GNUNET_TESTBED_Host *host)
 {
-  struct RegisteredController *rc;
-  uint32_t id;
-
   GNUNET_assert (host->id < host_list_size);
   GNUNET_assert (host_list[host->id] == host);
   host_list[host->id] = NULL;
   /* clear registered controllers list */
-  for (rc = host->rc_head; NULL != rc; rc = host->rc_head)
+  for (struct RegisteredController *rc = host->rc_head;
+       NULL != rc;
+       rc = host->rc_head)
   {
     GNUNET_CONTAINER_DLL_remove (host->rc_head, host->rc_tail, rc);
     GNUNET_free (rc);
   }
-  GNUNET_free_non_null ((char *) host->username);
-  GNUNET_free_non_null ((char *) host->hostname);
+  GNUNET_free_nz ((char *) host->username);
+  GNUNET_free_nz ((char *) host->hostname);
   GNUNET_TESTBED_operation_queue_destroy_ (
     host->opq_parallel_overlay_connect_operations);
   GNUNET_CONFIGURATION_destroy (host->cfg);
   GNUNET_free (host);
   while (host_list_size >= HOST_LIST_GROW_STEP)
   {
+    uint32_t id;
+
     for (id = host_list_size - 1; id > host_list_size - HOST_LIST_GROW_STEP;
          id--)
       if (NULL != host_list[id])
@@ -1223,7 +1224,7 @@ GNUNET_TESTBED_controller_destroy_ (struct GNUNET_TESTBED_ControllerProc *cproc)
     free_argv (cproc->helper_argv);
   cproc->host->controller_started = GNUNET_NO;
   cproc->host->locked = GNUNET_NO;
-  GNUNET_free_non_null (cproc->msg);
+  GNUNET_free (cproc->msg);
   GNUNET_free (cproc);
 }
 
@@ -1383,8 +1384,7 @@ GNUNET_TESTBED_is_host_habitable (
     join_argv ((const char **) rsh_args, (const char **) rsh_suffix_args);
   free_argv (rsh_suffix_args);
   free_argv (rsh_args);
-  h->auxp = GNUNET_OS_start_process_vap (GNUNET_NO,
-                                         GNUNET_OS_INHERIT_STD_ERR,
+  h->auxp = GNUNET_OS_start_process_vap (GNUNET_OS_INHERIT_STD_ERR,
                                          NULL,
                                          NULL,
                                          NULL,
diff --git a/src/testbed/testbed_api_operations.c b/src/testbed/testbed_api_operations.c
index a406c0e0b..ae85e0842 100644
--- a/src/testbed/testbed_api_operations.c
+++ b/src/testbed/testbed_api_operations.c
@@ -696,7 +696,7 @@ decide_capacity (struct OperationQueue *opq,
   }
 
 ret:
-  GNUNET_free_non_null (evict_entries);
+  GNUNET_free (evict_entries);
   if (NULL != ops_)
     *ops_ = ops;
   else
@@ -771,7 +771,7 @@ check_readiness (struct GNUNET_TESTBED_Operation *op)
     if (GNUNET_NO == decide_capacity (op->queues[i], op->qentries[i],
                                       &ops, &n_ops))
     {
-      GNUNET_free_non_null (evict_ops);
+      GNUNET_free (evict_ops);
       return GNUNET_NO;
     }
     if (NULL == ops)
@@ -842,7 +842,7 @@ cleanup_tslots (struct OperationQueue *queue)
       continue;
     GNUNET_CONTAINER_DLL_remove (op->tslots_head, op->tslots_tail, tslot);
   }
-  GNUNET_free_non_null (fctx->tslots_freeptr);
+  GNUNET_free (fctx->tslots_freeptr);
   fctx->tslots_freeptr = NULL;
   fctx->alloc_head = NULL;
   fctx->alloc_tail = NULL;
@@ -1337,7 +1337,7 @@ GNUNET_TESTBED_operation_release_ (struct GNUNET_TESTBED_Operation *op)
     }
     GNUNET_free (entry);
   }
-  GNUNET_free_non_null (op->qentries);
+  GNUNET_free (op->qentries);
   GNUNET_free (op->queues);
   GNUNET_free (op->nres);
   if (NULL != op->release)
@@ -1376,7 +1376,7 @@ GNUNET_TESTBED_operations_fini ()
       warn = 1;
     queue_destroy (queue);
   }
-  GNUNET_free_non_null (expired_opqs);
+  GNUNET_free (expired_opqs);
   n_expired_opqs = 0;
   if (warn)
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
diff --git a/src/testbed/testbed_api_peers.c b/src/testbed/testbed_api_peers.c
index 7bd895871..99d30e85b 100644
--- a/src/testbed/testbed_api_peers.c
+++ b/src/testbed/testbed_api_peers.c
@@ -952,7 +952,7 @@ oprelease_manage_service (void *cls)
   case OPC_STATE_FINISHED:
     break;
   }
-  GNUNET_free_non_null (data);
+  GNUNET_free (data);
   GNUNET_free (opc);
 }
 
diff --git a/src/testbed/testbed_api_statistics.c b/src/testbed/testbed_api_statistics.c
index 4858208cc..7fe47d2a0 100644
--- a/src/testbed/testbed_api_statistics.c
+++ b/src/testbed/testbed_api_statistics.c
@@ -378,8 +378,8 @@ oprelease_get_stats (void *cls)
     }
     GNUNET_free (sc->ops);
   }
-  GNUNET_free_non_null (sc->subsystem);
-  GNUNET_free_non_null (sc->name);
+  GNUNET_free (sc->subsystem);
+  GNUNET_free (sc->name);
   GNUNET_free (sc);
   if (GNUNET_YES ==
       GNUNET_TESTBED_operation_queue_destroy_empty_ (no_wait_queue))
diff --git a/src/testbed/testbed_api_testbed.c b/src/testbed/testbed_api_testbed.c
index 7be8054ca..7ae30e0c6 100644
--- a/src/testbed/testbed_api_testbed.c
+++ b/src/testbed/testbed_api_testbed.c
@@ -472,11 +472,11 @@ cleanup (struct GNUNET_TESTBED_RunHandle *rc)
     GNUNET_TESTBED_host_destroy (rc->h);
   for (hid = 0; hid < rc->num_hosts; hid++)
     GNUNET_TESTBED_host_destroy (rc->hosts[hid]);
-  GNUNET_free_non_null (rc->hosts);
+  GNUNET_free (rc->hosts);
   if (NULL != rc->cfg)
     GNUNET_CONFIGURATION_destroy (rc->cfg);
-  GNUNET_free_non_null (rc->topo_file);
-  GNUNET_free_non_null (rc->trusted_ip);
+  GNUNET_free (rc->topo_file);
+  GNUNET_free (rc->trusted_ip);
   GNUNET_free (rc);
 }
 
@@ -863,7 +863,7 @@ event_cb (void *cls, const struct GNUNET_TESTBED_EventInformation *event)
   case RC_PEERS_CREATED:
   case RC_READY:
     rc->state = RC_PEERS_SHUTDOWN;
-    GNUNET_free_non_null (rc->peers);
+    GNUNET_free (rc->peers);
     rc->peers = NULL;
     DEBUG ("Peers shut down in %s\n", prof_time (rc));
     GNUNET_SCHEDULER_shutdown ();
diff --git a/src/testbed/testbed_api_topology.c b/src/testbed/testbed_api_topology.c
index 9ffe7f47d..1d765af92 100644
--- a/src/testbed/testbed_api_topology.c
+++ b/src/testbed/testbed_api_topology.c
@@ -1183,7 +1183,7 @@ _exit:
         struct TopologyContextOverlay *overlay;
 
         overlay = &tc->u.overlay;
-        GNUNET_free_non_null (overlay->link_array);
+        GNUNET_free (overlay->link_array);
         overlay->link_array = NULL;
       }
       break;
@@ -1193,7 +1193,7 @@ _exit:
         struct TopologyContextUnderlay *underlay;
 
         underlay = &tc->u.underlay;
-        GNUNET_free_non_null (underlay->link_array);
+        GNUNET_free (underlay->link_array);
         underlay->link_array = NULL;
       }
       break;
@@ -1428,7 +1428,7 @@ GNUNET_TESTBED_overlay_configure_topology_va (void *op_cls,
     default:
       GNUNET_break (0);         /* Should not use any other option apart from
                                  * the ones handled here */
-      GNUNET_free_non_null (overlay->link_array);
+      GNUNET_free (overlay->link_array);
       GNUNET_free (tc);
       return NULL;
     }
@@ -1653,7 +1653,7 @@ GNUNET_TESTBED_underlay_construct_ (int num_peers,
       break;
     }
   }
-  GNUNET_free_non_null (underlay->link_array);
+  GNUNET_free (underlay->link_array);
   return ret;
 }
 
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am
index 9c6357455..2b599f55b 100644
--- a/src/testing/Makefile.am
+++ b/src/testing/Makefile.am
@@ -20,6 +20,9 @@ libgnunettesting_la_LIBADD = \
  $(top_builddir)/src/arm/libgnunetarm.la \
  $(top_builddir)/src/util/libgnunetutil.la \
  $(LTLIBINTL)
+libgnunettesting_la_DEPENDENCIES = \
+ $(top_builddir)/src/arm/libgnunetarm.la \
+ $(top_builddir)/src/util/libgnunetutil.la
 libgnunettesting_la_LDFLAGS = \
  $(GN_LIB_LDFLAGS) \
  -version-info 2:0:1
diff --git a/src/testing/gnunet-testing.c b/src/testing/gnunet-testing.c
index a9e5042b2..88906e5fa 100644
--- a/src/testing/gnunet-testing.c
+++ b/src/testing/gnunet-testing.c
@@ -365,7 +365,7 @@ run_no_scheduler (void *cls,
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Extracting hostkey %u\n", create_no);
     ret = create_hostkeys (create_no);
   }
-  GNUNET_free_non_null (create_cfg_template);
+  GNUNET_free (create_cfg_template);
 }
 
 
diff --git a/src/testing/test_testing_peerstartup.c b/src/testing/test_testing_peerstartup.c
index 4e21fedc9..25cbb2a9f 100644
--- a/src/testing/test_testing_peerstartup.c
+++ b/src/testing/test_testing_peerstartup.c
@@ -118,7 +118,7 @@ run (void *cls, char *const *args, const char *cfgfile,
 
 end:
   GNUNET_SCHEDULER_add_now (&do_shutdown, test_ctx);
-  GNUNET_free_non_null (emsg);
+  GNUNET_free (emsg);
 }
 
 
diff --git a/src/testing/test_testing_peerstartup2.c b/src/testing/test_testing_peerstartup2.c
index 26948b7c5..8d357cb08 100644
--- a/src/testing/test_testing_peerstartup2.c
+++ b/src/testing/test_testing_peerstartup2.c
@@ -197,7 +197,7 @@ run (void *cls, char *const *args, const char *cfgfile,
 end:
   FAIL_TEST (0);
   GNUNET_SCHEDULER_add_now (&do_shutdown, test_ctx);
-  GNUNET_free_non_null (emsg);
+  GNUNET_free (emsg);
 }
 
 
diff --git a/src/testing/test_testing_sharedservices.c b/src/testing/test_testing_sharedservices.c
index 77def3453..d2f760d7a 100644
--- a/src/testing/test_testing_sharedservices.c
+++ b/src/testing/test_testing_sharedservices.c
@@ -139,7 +139,7 @@ run (void *cls, char *const *args, const char *cfgfile,
 
 end:
   GNUNET_SCHEDULER_add_now (&do_shutdown, test_ctx);
-  GNUNET_free_non_null (emsg);
+  GNUNET_free (emsg);
 }
 
 
diff --git a/src/testing/testing.c b/src/testing/testing.c
index 23bc40d7e..9724fb55b 100644
--- a/src/testing/testing.c
+++ b/src/testing/testing.c
@@ -38,12 +38,6 @@
 
 
 /**
- * We need pipe control only on WINDOWS
- */
-#define PIPE_CONTROL GNUNET_NO
-
-
-/**
  * Lowest port used for GNUnet testing.  Should be high enough to not
  * conflict with other applications running on the hosts but be low
  * enough to not conflict with client-ports (typically starting around
@@ -473,8 +467,8 @@ cleanup_shared_service_instance (struct SharedServiceInstance *i)
     (void) unlink (i->cfg_fn);
     GNUNET_free (i->cfg_fn);
   }
-  GNUNET_free_non_null (i->unix_sock);
-  GNUNET_free_non_null (i->port_str);
+  GNUNET_free (i->unix_sock);
+  GNUNET_free (i->port_str);
   GNUNET_break (NULL == i->proc);
   GNUNET_break (0 == i->n_refs);
   GNUNET_free (i);
@@ -492,8 +486,7 @@ start_shared_service_instance (struct SharedServiceInstance *i)
   (void) GNUNET_asprintf (&binary, "gnunet-service-%s", i->ss->sname);
   libexec_binary = GNUNET_OS_get_libexec_binary_path (binary);
   GNUNET_free (binary);
-  i->proc = GNUNET_OS_start_process (PIPE_CONTROL,
-                                     GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+  i->proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                      NULL,
                                      NULL,
                                      NULL,
@@ -551,17 +544,17 @@ GNUNET_TESTING_system_destroy (struct GNUNET_TESTING_System *system,
         stop_shared_service_instance (i);
       cleanup_shared_service_instance (i);
     }
-    GNUNET_free_non_null (ss->instances);
+    GNUNET_free (ss->instances);
     GNUNET_CONFIGURATION_destroy (ss->cfg);
     GNUNET_free (ss->sname);
     GNUNET_free (ss);
   }
-  GNUNET_free_non_null (system->shared_services);
+  GNUNET_free (system->shared_services);
   if (GNUNET_YES == remove_paths)
     GNUNET_DISK_directory_remove (system->tmppath);
   GNUNET_free (system->tmppath);
-  GNUNET_free_non_null (system->trusted_ip);
-  GNUNET_free_non_null (system->hostname);
+  GNUNET_free (system->trusted_ip);
+  GNUNET_free (system->hostname);
   GNUNET_free (system);
 }
 
@@ -957,7 +950,7 @@ update_config_sections (void *cls, const char *section)
     }
     GNUNET_free (ikeys);
   }
-  GNUNET_free_non_null (val);
+  GNUNET_free (val);
   ACCEPT_FROM_key = "ACCEPT_FROM";
   if ((NULL != uc->system->trusted_ip) &&
       (NULL != strstr (uc->system->trusted_ip, ":"))) /* IPv6 in use */
@@ -1120,7 +1113,7 @@ GNUNET_TESTING_configuration_create_ (struct GNUNET_TESTING_System *system,
     *nports = uc.nports;
   }
   else
-    GNUNET_free_non_null (uc.ports);
+    GNUNET_free (uc.ports);
   return uc.status;
 }
 
@@ -1316,8 +1309,8 @@ GNUNET_TESTING_peer_configure (struct GNUNET_TESTING_System *system,
   return peer;
 
 err_ret:
-  GNUNET_free_non_null (ss_instances);
-  GNUNET_free_non_null (ports);
+  GNUNET_free (ss_instances);
+  GNUNET_free (ports);
   GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "%s", emsg_);
   if (NULL != emsg)
     *emsg = emsg_;
@@ -1378,8 +1371,7 @@ GNUNET_TESTING_peer_start (struct GNUNET_TESTING_Peer *peer)
   peer->main_binary =
     GNUNET_CONFIGURATION_expand_dollar (peer->cfg, peer->main_binary);
   peer->main_process =
-    GNUNET_OS_start_process_s (PIPE_CONTROL,
-                               GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+    GNUNET_OS_start_process_s (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                NULL,
                                peer->main_binary,
                                peer->args,
@@ -1566,8 +1558,8 @@ GNUNET_TESTING_peer_destroy (struct GNUNET_TESTING_Peer *peer)
     GNUNET_CONFIGURATION_destroy (peer->cfg);
   GNUNET_free (peer->main_binary);
   GNUNET_free (peer->args);
-  GNUNET_free_non_null (peer->id);
-  GNUNET_free_non_null (peer->ss_instances);
+  GNUNET_free (peer->id);
+  GNUNET_free (peer->ss_instances);
   if (NULL != peer->ports)
   {
     for (cnt = 0; cnt < peer->nports; cnt++)
diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c
index c6f600df1..b380c0bd4 100644
--- a/src/topology/gnunet-daemon-topology.c
+++ b/src/topology/gnunet-daemon-topology.c
@@ -275,7 +275,7 @@ free_peer (void *cls, const struct GNUNET_PeerIdentity *pid, void *value)
   }
   if (NULL != pos->hello)
   {
-    GNUNET_free_non_null (pos->hello);
+    GNUNET_free (pos->hello);
     pos->hello = NULL;
   }
   if (NULL != pos->filter)
@@ -812,7 +812,7 @@ process_peer (void *cls,
     pos = GNUNET_CONTAINER_multipeermap_get (peers, peer);
     if (NULL != pos)
     {
-      GNUNET_free_non_null (pos->hello);
+      GNUNET_free (pos->hello);
       pos->hello = NULL;
       if (NULL != pos->filter)
       {
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index 127ba9516..e0369059d 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -155,7 +155,15 @@ libgnunettransporttesting_la_LIBADD = \
   $(top_builddir)/src/ats/libgnunetats.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/arm/libgnunetarm.la \
   $(GN_LIBINTL)
+libgnunettransporttesting_la_DEPENDENCIES = \
+  libgnunettransport.la \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/util/libgnunetutil.la \
+  $(top_builddir)/src/testing/libgnunettesting.la \
+  $(top_builddir)/src/arm/libgnunetarm.la
 libgnunettransporttesting_la_LDFLAGS = \
  $(GN_LIB_LDFLAGS)
 
@@ -185,6 +193,10 @@ libgnunettransport_la_LIBADD = \
   $(top_builddir)/src/ats/libgnunetats.la \
   $(top_builddir)/src/util/libgnunetutil.la \
   $(GN_LIBINTL)
+libgnunettransport_la_DEPENDENCIES = \
+  $(top_builddir)/src/hello/libgnunethello.la \
+  $(top_builddir)/src/ats/libgnunetats.la \
+  $(top_builddir)/src/util/libgnunetutil.la
 libgnunettransport_la_LDFLAGS = \
   $(GN_LIB_LDFLAGS)  \
   -version-info 4:0:2
diff --git a/src/transport/gnunet-communicator-tcp.c b/src/transport/gnunet-communicator-tcp.c
index 9da14dcb0..ec9f5986a 100644
--- a/src/transport/gnunet-communicator-tcp.c
+++ b/src/transport/gnunet-communicator-tcp.c
@@ -707,7 +707,6 @@ struct Addresses
 };
 
 
-
 /**
  * Maximum queue length before we stop reading towards the transport service.
  */
@@ -1618,6 +1617,7 @@ queue_read (void *cls)
   queue_finish (queue);
 }
 
+
 /**
  * Convert a `struct sockaddr_in6 to a `struct sockaddr *`
  *
@@ -1642,6 +1642,7 @@ tcp_address_to_sockaddr_numeric_v6 (socklen_t *sock_len, struct sockaddr_in6 v6,
   return in;
 }
 
+
 /**
  * Convert a `struct sockaddr_in4 to a `struct sockaddr *`
  *
@@ -1665,6 +1666,7 @@ tcp_address_to_sockaddr_numeric_v4 (socklen_t *sock_len, struct sockaddr_in v4,
   return in;
 }
 
+
 /**
  * Convert TCP bind specification to a `struct PortOnlyIpv4Ipv6  *`
  *
@@ -1724,6 +1726,7 @@ tcp_address_to_sockaddr_port_only (const char *bindto, unsigned int *port)
   return po;
 }
 
+
 /**
  * This Method extracts the address part of the BINDTO string.
  *
@@ -1750,7 +1753,8 @@ extract_address (const char *bindto)
     start++;   /* skip over '['*/
     cp[strlen (cp) - 1] = '\0';  /* eat ']'*/
   }
-  else {
+  else
+  {
     token = strtok_r (cp, "]", &rest);
     if (strlen (bindto) == strlen (token))
     {
@@ -1768,6 +1772,7 @@ extract_address (const char *bindto)
   return start;
 }
 
+
 /**
  * This Method extracts the port part of the BINDTO string.
  *
@@ -1846,6 +1851,7 @@ extract_port (const char *addr_and_port)
   return port;
 }
 
+
 /**
  * Convert TCP bind specification to a `struct sockaddr *`
  *
@@ -2683,6 +2689,7 @@ queue_read_kx (void *cls)
     queue->read_task = GNUNET_SCHEDULER_add_now (&queue_read, queue);
 }
 
+
 /**
  * Function called by the transport service to initialize a
  * message queue given address information about another peer.
@@ -2777,6 +2784,7 @@ mq_init (void *cls, const struct GNUNET_PeerIdentity *peer, const char *address)
   return GNUNET_OK;
 }
 
+
 /**
  * Iterator over all message queues to clean up.
  *
@@ -2911,6 +2919,7 @@ nat_address_cb (void *cls,
   }
 }
 
+
 /**
  * This method launch network interactions for each address we like to bind to.
  *
@@ -3015,7 +3024,7 @@ init_socket (const struct sockaddr *addr,
   if (NULL == queue_map)
     queue_map = GNUNET_CONTAINER_multipeermap_create (10, GNUNET_NO);
 
-  if (NULL == ch )
+  if (NULL == ch)
     ch = GNUNET_TRANSPORT_communicator_connect (cfg,
                                                 COMMUNICATOR_CONFIG_SECTION,
                                                 COMMUNICATOR_ADDRESS_PREFIX,
@@ -3038,6 +3047,7 @@ init_socket (const struct sockaddr *addr,
 
 }
 
+
 /**
  * This method reads from the DLL addrs_head to register them at the NAT service.
  */
@@ -3092,6 +3102,7 @@ nat_register ()
   }
 }
 
+
 /**
  * This method adds addresses to the DLL, that are later register at the NAT service.
  */
@@ -3108,6 +3119,7 @@ add_addr (struct sockaddr *in, socklen_t in_len)
   addrs_lens++;
 }
 
+
 /**
  * This method is the callback called by the resolver API, and wraps method init_socket.
  *
@@ -3160,6 +3172,7 @@ init_socket_resolv (void *cls,
   }
 }
 
+
 /**
  * Setup communicator and launch network interactions.
  *
diff --git a/src/transport/gnunet-communicator-udp.c b/src/transport/gnunet-communicator-udp.c
index 585b29c2d..03c120cc9 100644
--- a/src/transport/gnunet-communicator-udp.c
+++ b/src/transport/gnunet-communicator-udp.c
@@ -783,7 +783,7 @@ bi_destroy (struct BroadcastInterface *bi)
   GNUNET_CONTAINER_DLL_remove (bi_head, bi_tail, bi);
   GNUNET_SCHEDULER_cancel (bi->broadcast_task);
   GNUNET_free (bi->sa);
-  GNUNET_free_non_null (bi->ba);
+  GNUNET_free (bi->ba);
   GNUNET_free (bi);
 }
 
@@ -1309,7 +1309,8 @@ handle_ack (void *cls, const struct GNUNET_PeerIdentity *pid, void *value)
                     "Tell transport we have more acks!\n");
         GNUNET_TRANSPORT_communicator_mq_update (ch,
                                                  receiver->d_qh,
-                                                 (allowed - ss->sequence_allowed),
+                                                 (allowed
+                                                  - ss->sequence_allowed),
                                                  1);
         ss->sequence_allowed = allowed;
         /* move ss to head to avoid discarding it anytime soon! */
diff --git a/src/transport/gnunet-communicator-unix.c b/src/transport/gnunet-communicator-unix.c
index 6ea0ea360..d7e18f87a 100644
--- a/src/transport/gnunet-communicator-unix.c
+++ b/src/transport/gnunet-communicator-unix.c
@@ -673,7 +673,8 @@ setup_queue (const struct GNUNET_PeerIdentity *target,
     queue->qh = GNUNET_TRANSPORT_communicator_mq_add (ch,
                                                       &queue->target,
                                                       foreign_addr,
-                                                      UNIX_MTU - sizeof (struct UNIXMessage),
+                                                      UNIX_MTU - sizeof (struct
+                                                                         UNIXMessage),
                                                       GNUNET_TRANSPORT_QUEUE_LENGTH_UNLIMITED,
                                                       0,
                                                       GNUNET_NT_LOOPBACK,
@@ -799,7 +800,7 @@ select_read_cb (void *cls)
     /* ensure aligned access */
     memcpy (&al_hdr, currhdr, sizeof(al_hdr));
     if ((tsize < sizeof(struct GNUNET_MessageHeader)) ||
-        (tsize != ntohs(al_hdr.size)))
+        (tsize != ntohs (al_hdr.size)))
     {
       GNUNET_break_op (0);
       return;
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c
index 93fa031f4..207c17f2f 100644
--- a/src/transport/gnunet-service-transport.c
+++ b/src/transport/gnunet-service-transport.c
@@ -727,9 +727,9 @@ handle_send_transmit_continuation (void *cls,
                 stcc->uuid);
     send_ok_msg.header.size = htons (sizeof(send_ok_msg));
     send_ok_msg.header.type = htons (GNUNET_MESSAGE_TYPE_TRANSPORT_SEND_OK);
-    send_ok_msg.bytes_msg = htonl (bytes_payload);
+    send_ok_msg.bytes_msg = htons (bytes_payload);
     send_ok_msg.bytes_physical = htonl (bytes_on_wire);
-    send_ok_msg.success = htonl (success);
+    send_ok_msg.success = htons (success);
     send_ok_msg.peer = stcc->target;
     unicast (stcc->tc, &send_ok_msg.header, GNUNET_NO);
   }
@@ -2108,7 +2108,7 @@ free_blacklist_entry (void *cls,
 {
   char *be = value;
 
-  GNUNET_free_non_null (be);
+  GNUNET_free (be);
   return GNUNET_OK;
 }
 
@@ -2511,7 +2511,7 @@ GST_blacklist_test_cancel (struct GST_BlacklistCheck *bc)
     GNUNET_SCHEDULER_cancel (bc->task);
     bc->task = NULL;
   }
-  GNUNET_free_non_null (bc->address);
+  GNUNET_free (bc->address);
   GNUNET_free (bc);
 }
 
diff --git a/src/transport/gnunet-service-transport_hello.c b/src/transport/gnunet-service-transport_hello.c
index ed6565d23..472c77c27 100644
--- a/src/transport/gnunet-service-transport_hello.c
+++ b/src/transport/gnunet-service-transport_hello.c
@@ -182,7 +182,7 @@ refresh_hello_task (void *cls)
   gc.addr_pos = oal_head;
   gc.expiration = GNUNET_TIME_relative_to_absolute (hello_expiration);
 
-  GNUNET_free_non_null (our_hello);
+  GNUNET_free (our_hello);
   our_hello = GNUNET_HELLO_create (&GST_my_identity.public_key,
                                    &address_generator,
                                    &gc,
diff --git a/src/transport/gnunet-transport.c b/src/transport/gnunet-transport.c
index 35da5ec10..0d71e1ff9 100644
--- a/src/transport/gnunet-transport.c
+++ b/src/transport/gnunet-transport.c
@@ -339,7 +339,7 @@ destroy_it (void *cls, const struct GNUNET_PeerIdentity *key, void *value)
   GNUNET_assert (
     GNUNET_OK ==
     GNUNET_CONTAINER_multipeermap_remove (monitored_peers, key, value));
-  GNUNET_free_non_null (m->address);
+  GNUNET_free (m->address);
   GNUNET_free (value);
   return GNUNET_OK;
 }
@@ -1037,7 +1037,7 @@ plugin_monitoring_cb (void *cls,
         GNUNET_TRANSPORT_address_to_string_cancel (addr->asc);
         addr->asc = NULL;
       }
-      GNUNET_free_non_null (addr->str);
+      GNUNET_free (addr->str);
       GNUNET_free (addr);
       *session_ctx = NULL;
     }
@@ -1069,7 +1069,7 @@ plugin_monitoring_cb (void *cls,
       GNUNET_TRANSPORT_address_to_string_cancel (addr->asc);
       addr->asc = NULL;
     }
-    GNUNET_free_non_null (addr->str);
+    GNUNET_free (addr->str);
     GNUNET_free (addr);
     *session_ctx = NULL;
   }
diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c
index 87cd7ead2..92ed2fe52 100644
--- a/src/transport/plugin_transport_http_client.c
+++ b/src/transport/plugin_transport_http_client.c
@@ -2207,9 +2207,9 @@ LIBGNUNET_PLUGIN_TRANSPORT_DONE (void *cls)
        _ ("Shutdown for plugin `%s' complete\n"),
        plugin->name);
   GNUNET_CONTAINER_multipeermap_destroy (plugin->sessions);
-  GNUNET_free_non_null (plugin->proxy_hostname);
-  GNUNET_free_non_null (plugin->proxy_username);
-  GNUNET_free_non_null (plugin->proxy_password);
+  GNUNET_free (plugin->proxy_hostname);
+  GNUNET_free (plugin->proxy_username);
+  GNUNET_free (plugin->proxy_password);
   GNUNET_free (plugin);
   GNUNET_free (api);
   return NULL;
@@ -2304,9 +2304,9 @@ client_configure_plugin (struct HTTP_Client_Plugin *plugin)
         GNUNET_free (proxy_type);
         GNUNET_free (plugin->proxy_hostname);
         plugin->proxy_hostname = NULL;
-        GNUNET_free_non_null (plugin->proxy_username);
+        GNUNET_free (plugin->proxy_username);
         plugin->proxy_username = NULL;
-        GNUNET_free_non_null (plugin->proxy_password);
+        GNUNET_free (plugin->proxy_password);
         plugin->proxy_password = NULL;
 
         return GNUNET_SYSERR;
@@ -2325,7 +2325,7 @@ client_configure_plugin (struct HTTP_Client_Plugin *plugin)
     if (GNUNET_SYSERR == plugin->proxy_use_httpproxytunnel)
       plugin->proxy_use_httpproxytunnel = GNUNET_NO;
 
-    GNUNET_free_non_null (proxy_type);
+    GNUNET_free (proxy_type);
   }
 
   /* Should we emulate an XHR client for testing? */
diff --git a/src/transport/plugin_transport_http_common.c b/src/transport/plugin_transport_http_common.c
index 2bcab42b4..d81d6db9c 100644
--- a/src/transport/plugin_transport_http_common.c
+++ b/src/transport/plugin_transport_http_common.c
@@ -34,10 +34,10 @@ http_clean_splitted (struct SplittedHTTPAddress *spa)
 {
   if (NULL != spa)
   {
-    GNUNET_free_non_null (spa->protocol);
-    GNUNET_free_non_null (spa->host);
-    GNUNET_free_non_null (spa->path);
-    GNUNET_free_non_null (spa);
+    GNUNET_free (spa->protocol);
+    GNUNET_free (spa->host);
+    GNUNET_free (spa->path);
+    GNUNET_free (spa);
   }
 }
 
@@ -494,7 +494,7 @@ http_common_plugin_address_pretty_printer (void *cls, const char *type,
     asc (asc_cls, ret, (NULL == ret) ? GNUNET_SYSERR : GNUNET_OK);
     asc (asc_cls, NULL, GNUNET_OK);
     http_clean_splitted (saddr);
-    GNUNET_free_non_null (sock_addr);
+    GNUNET_free (sock_addr);
     return;
   }
   if ((GNUNET_YES == numeric) &&
@@ -510,7 +510,7 @@ http_common_plugin_address_pretty_printer (void *cls, const char *type,
       goto handle_error;
     }
     /* Wait for resolver callback */
-    GNUNET_free_non_null (sock_addr);
+    GNUNET_free (sock_addr);
     return;
   }
   if ((GNUNET_NO == numeric) &&
@@ -531,7 +531,7 @@ http_common_plugin_address_pretty_printer (void *cls, const char *type,
       goto handle_error;
     }
     /* Wait for resolver callback */
-    GNUNET_free_non_null (sock_addr);
+    GNUNET_free (sock_addr);
     return;
   }
   if ((GNUNET_NO == numeric) &&
@@ -541,7 +541,7 @@ http_common_plugin_address_pretty_printer (void *cls, const char *type,
     ret = http_common_plugin_address_to_string (type, address, addrlen);
     asc (asc_cls, ret, (NULL == ret) ? GNUNET_SYSERR : GNUNET_OK);
     asc (asc_cls, NULL, GNUNET_OK);
-    GNUNET_free_non_null (sock_addr);
+    GNUNET_free (sock_addr);
     http_clean_splitted (saddr);
     return;
   }
@@ -553,7 +553,7 @@ handle_error:
   /* Report error */
   asc (asc_cls, NULL, GNUNET_SYSERR);
   asc (asc_cls, NULL, GNUNET_OK);
-  GNUNET_free_non_null (sock_addr);
+  GNUNET_free (sock_addr);
   if (NULL != saddr)
     http_clean_splitted (saddr);
 }
diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c
index eef83b29d..d1b21ba9c 100644
--- a/src/transport/plugin_transport_http_server.c
+++ b/src/transport/plugin_transport_http_server.c
@@ -1495,7 +1495,7 @@ server_lookup_connection (struct HTTP_Server_Plugin *plugin,
          http_common_plugin_address_to_string (plugin->protocol,
                                                addr,
                                                addr_len));
-    GNUNET_free_non_null (addr);
+    GNUNET_free (addr);
   }
 
   if ((_RECEIVE == direction) &&
@@ -2179,16 +2179,16 @@ server_load_certificate (struct HTTP_Server_Plugin *plugin)
   {
     struct GNUNET_OS_Process *cert_creation;
 
-    GNUNET_free_non_null (plugin->key);
+    GNUNET_free (plugin->key);
     plugin->key = NULL;
-    GNUNET_free_non_null (plugin->cert);
+    GNUNET_free (plugin->cert);
     plugin->cert = NULL;
 
     GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                 "No usable TLS certificate found, creating certificate\n");
     errno = 0;
     cert_creation =
-      GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+      GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                NULL, NULL, NULL,
                                "gnunet-transport-certificate-creation",
                                "gnunet-transport-certificate-creation",
@@ -2203,11 +2203,11 @@ server_load_certificate (struct HTTP_Server_Plugin *plugin)
       GNUNET_free (key_file);
       GNUNET_free (cert_file);
 
-      GNUNET_free_non_null (plugin->key);
+      GNUNET_free (plugin->key);
       plugin->key = NULL;
-      GNUNET_free_non_null (plugin->cert);
+      GNUNET_free (plugin->cert);
       plugin->cert = NULL;
-      GNUNET_free_non_null (plugin->crypto_init);
+      GNUNET_free (plugin->crypto_init);
       plugin->crypto_init = NULL;
 
       return GNUNET_SYSERR;
@@ -2228,11 +2228,11 @@ server_load_certificate (struct HTTP_Server_Plugin *plugin)
     GNUNET_free (key_file);
     GNUNET_free (cert_file);
 
-    GNUNET_free_non_null (plugin->key);
+    GNUNET_free (plugin->key);
     plugin->key = NULL;
-    GNUNET_free_non_null (plugin->cert);
+    GNUNET_free (plugin->cert);
     plugin->cert = NULL;
-    GNUNET_free_non_null (plugin->crypto_init);
+    GNUNET_free (plugin->crypto_init);
     plugin->crypto_init = NULL;
 
     return GNUNET_SYSERR;
@@ -2871,8 +2871,8 @@ server_start_report_addresses (struct HTTP_Server_Plugin *plugin)
     GNUNET_assert (NULL != addrs[res]);
     GNUNET_free (addrs[res]);
   }
-  GNUNET_free_non_null (addrs);
-  GNUNET_free_non_null (addrlens);
+  GNUNET_free (addrs);
+  GNUNET_free (addrlens);
 }
 
 
@@ -3316,9 +3316,9 @@ LIBGNUNET_PLUGIN_TRANSPORT_DONE (void *cls)
     plugin->server_v6_task = NULL;
   }
 #if BUILD_HTTPS
-  GNUNET_free_non_null (plugin->crypto_init);
-  GNUNET_free_non_null (plugin->cert);
-  GNUNET_free_non_null (plugin->key);
+  GNUNET_free (plugin->crypto_init);
+  GNUNET_free (plugin->cert);
+  GNUNET_free (plugin->key);
 #endif
   GNUNET_CONTAINER_multipeermap_iterate (plugin->sessions,
                                          &destroy_session_shutdown_cb,
@@ -3336,10 +3336,10 @@ LIBGNUNET_PLUGIN_TRANSPORT_DONE (void *cls)
     plugin->server_v6 = NULL;
   }
   /* Clean up */
-  GNUNET_free_non_null (plugin->external_hostname);
-  GNUNET_free_non_null (plugin->ext_addr);
-  GNUNET_free_non_null (plugin->server_addr_v4);
-  GNUNET_free_non_null (plugin->server_addr_v6);
+  GNUNET_free (plugin->external_hostname);
+  GNUNET_free (plugin->ext_addr);
+  GNUNET_free (plugin->server_addr_v4);
+  GNUNET_free (plugin->server_addr_v6);
   regfree (&plugin->url_regex);
 
   LOG (GNUNET_ERROR_TYPE_DEBUG,
diff --git a/src/transport/plugin_transport_smtp.c b/src/transport/plugin_transport_smtp.c
index 330023118..f3db4fc5a 100644
--- a/src/transport/plugin_transport_smtp.c
+++ b/src/transport/plugin_transport_smtp.c
@@ -174,9 +174,9 @@ listenAndDistribute (void *unused)
          goto END; \
        } \
        if (core_api->load_monitor != NULL) \
-         GNUNET_network_monitor_notify_transmission (core_api->load_monitor, \
-                                                     GNUNET_ND_DOWNLOAD, \
-                                                     strlen (retl)); \
+       GNUNET_network_monitor_notify_transmission (core_api->load_monitor, \
+                                                   GNUNET_ND_DOWNLOAD, \
+                                                   strlen (retl)); \
   } while (0)
 
 
diff --git a/src/transport/plugin_transport_tcp.c b/src/transport/plugin_transport_tcp.c
index 4cec181b0..e3bc21543 100644
--- a/src/transport/plugin_transport_tcp.c
+++ b/src/transport/plugin_transport_tcp.c
@@ -1186,7 +1186,7 @@ get_server_addresses (const char *service_name,
           (EACCES == errno))
       {
         GNUNET_log_strerror (GNUNET_ERROR_TYPE_ERROR, "socket");
-        GNUNET_free_non_null (hostname);
+        GNUNET_free (hostname);
         GNUNET_free (unixpath);
         return GNUNET_SYSERR;
       }
@@ -1212,7 +1212,7 @@ get_server_addresses (const char *service_name,
          _ (
            "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"),
          service_name);
-    GNUNET_free_non_null (hostname);
+    GNUNET_free (hostname);
     return GNUNET_SYSERR;
   }
   if (0 == port)
@@ -1220,8 +1220,8 @@ get_server_addresses (const char *service_name,
     saddrs = GNUNET_malloc (2 * sizeof(struct sockaddr *));
     saddrlens = GNUNET_malloc (2 * sizeof(socklen_t));
     add_unixpath (saddrs, saddrlens, unixpath, abstract);
-    GNUNET_free_non_null (unixpath);
-    GNUNET_free_non_null (hostname);
+    GNUNET_free (unixpath);
+    GNUNET_free (hostname);
     *addrs = saddrs;
     *addr_lens = saddrlens;
     return 1;
@@ -1245,7 +1245,7 @@ get_server_addresses (const char *service_name,
            hostname,
            gai_strerror (ret));
       GNUNET_free (hostname);
-      GNUNET_free_non_null (unixpath);
+      GNUNET_free (unixpath);
       return GNUNET_SYSERR;
     }
     next = res;
@@ -1265,7 +1265,7 @@ get_server_addresses (const char *service_name,
            hostname);
       freeaddrinfo (res);
       GNUNET_free (hostname);
-      GNUNET_free_non_null (unixpath);
+      GNUNET_free (unixpath);
       return GNUNET_SYSERR;
     }
     resi = i;
@@ -1372,7 +1372,7 @@ get_server_addresses (const char *service_name,
       ((struct sockaddr_in *) saddrs[i])->sin_port = htons (port);
     }
   }
-  GNUNET_free_non_null (unixpath);
+  GNUNET_free (unixpath);
   *addrs = saddrs;
   *addr_lens = saddrlens;
   return resi;
@@ -3163,7 +3163,7 @@ handle_tcp_welcome (void *cls,
       else
       {
         GNUNET_break (0);
-        GNUNET_free_non_null (vaddr);
+        GNUNET_free (vaddr);
         GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
         return;
       }
@@ -3267,7 +3267,7 @@ handle_tcp_data (void *cls,
          GNUNET_a2s (vaddr, alen));
     GNUNET_break_op (0);
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-    GNUNET_free_non_null (vaddr);
+    GNUNET_free (vaddr);
     return;
   }
   if (GNUNET_YES == session->expecting_welcome)
@@ -3284,7 +3284,7 @@ handle_tcp_data (void *cls,
          GNUNET_a2s (vaddr, alen));
     GNUNET_break_op (0);
     GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
-    GNUNET_free_non_null (vaddr);
+    GNUNET_free (vaddr);
     return;
   }
 
@@ -3300,7 +3300,7 @@ handle_tcp_data (void *cls,
          (unsigned int) ntohs (message->type),
          GNUNET_i2s (&session->target),
          GNUNET_a2s (vaddr, alen));
-    GNUNET_free_non_null (vaddr);
+    GNUNET_free (vaddr);
   }
 
   GNUNET_STATISTICS_update (plugin->env->stats,
@@ -3802,8 +3802,8 @@ libgnunet_plugin_transport_tcp_init (void *cls)
                                        plugin);
     for (ret = ret_s - 1; ret >= 0; ret--)
       GNUNET_free (addrs[ret]);
-    GNUNET_free_non_null (addrs);
-    GNUNET_free_non_null (addrlens);
+    GNUNET_free (addrs);
+    GNUNET_free (addrlens);
   }
   else
   {
@@ -3893,7 +3893,7 @@ die:
   if (NULL != service)
     LEGACY_SERVICE_stop (service);
   GNUNET_free (plugin);
-  GNUNET_free_non_null (api);
+  GNUNET_free (api);
   return NULL;
 }
 
diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c
index ef4fddb24..ec3a0edd8 100644
--- a/src/transport/plugin_transport_udp.c
+++ b/src/transport/plugin_transport_udp.c
@@ -3669,7 +3669,7 @@ libgnunet_plugin_transport_udp_init (void *cls)
     }
     have_bind4 = GNUNET_YES;
   }
-  GNUNET_free_non_null (bind4_address);
+  GNUNET_free (bind4_address);
   have_bind6 = GNUNET_NO;
   memset (&server_addrv6, 0, sizeof(server_addrv6));
   if (GNUNET_YES == GNUNET_CONFIGURATION_get_value_string (env->cfg,
@@ -3691,7 +3691,7 @@ libgnunet_plugin_transport_udp_init (void *cls)
     }
     have_bind6 = GNUNET_YES;
   }
-  GNUNET_free_non_null (bind6_address);
+  GNUNET_free (bind6_address);
 
   enable_broadcasting = GNUNET_CONFIGURATION_get_value_yesno (env->cfg,
                                                               "transport-udp",
diff --git a/src/transport/plugin_transport_wlan.c b/src/transport/plugin_transport_wlan.c
index 17d72135b..74b8d5a8a 100644
--- a/src/transport/plugin_transport_wlan.c
+++ b/src/transport/plugin_transport_wlan.c
@@ -2093,7 +2093,7 @@ LIBGNUNET_PLUGIN_TRANSPORT_DONE (void *cls)
     GNUNET_SERVER_mst_destroy (plugin->helper_payload_tokenizer);
     plugin->helper_payload_tokenizer = NULL;
   }
-  GNUNET_free_non_null (plugin->wlan_interface);
+  GNUNET_free (plugin->wlan_interface);
   GNUNET_free (plugin);
   GNUNET_free (api);
   return NULL;
diff --git a/src/transport/tcp_connection_legacy.c b/src/transport/tcp_connection_legacy.c
index 4e8c8140d..3e173b8a4 100644
--- a/src/transport/tcp_connection_legacy.c
+++ b/src/transport/tcp_connection_legacy.c
@@ -1088,8 +1088,8 @@ GNUNET_CONNECTION_destroy (struct GNUNET_CONNECTION_Handle *connection)
                                 * leak the socket in this special case) ... */
     }
   }
-  GNUNET_free_non_null (connection->addr);
-  GNUNET_free_non_null (connection->hostname);
+  GNUNET_free (connection->addr);
+  GNUNET_free (connection->hostname);
   GNUNET_free (connection->write_buffer);
   GNUNET_free (connection);
 }
diff --git a/src/transport/tcp_service_legacy.c b/src/transport/tcp_service_legacy.c
index fb4e9c3c9..12dce3993 100644
--- a/src/transport/tcp_service_legacy.c
+++ b/src/transport/tcp_service_legacy.c
@@ -657,7 +657,7 @@ LEGACY_SERVICE_get_server_addresses (
           (EACCES == errno))
       {
         LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "socket");
-        GNUNET_free_non_null (hostname);
+        GNUNET_free (hostname);
         GNUNET_free (unixpath);
         return GNUNET_SYSERR;
       }
@@ -683,7 +683,7 @@ LEGACY_SERVICE_get_server_addresses (
          _ (
            "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"),
          service_name);
-    GNUNET_free_non_null (hostname);
+    GNUNET_free (hostname);
     return GNUNET_SYSERR;
   }
   if (0 == port)
@@ -691,8 +691,8 @@ LEGACY_SERVICE_get_server_addresses (
     saddrs = GNUNET_malloc (2 * sizeof(struct sockaddr *));
     saddrlens = GNUNET_malloc (2 * sizeof(socklen_t));
     add_unixpath (saddrs, saddrlens, unixpath, abstract);
-    GNUNET_free_non_null (unixpath);
-    GNUNET_free_non_null (hostname);
+    GNUNET_free (unixpath);
+    GNUNET_free (hostname);
     *addrs = saddrs;
     *addr_lens = saddrlens;
     return 1;
@@ -716,7 +716,7 @@ LEGACY_SERVICE_get_server_addresses (
            hostname,
            gai_strerror (ret));
       GNUNET_free (hostname);
-      GNUNET_free_non_null (unixpath);
+      GNUNET_free (unixpath);
       return GNUNET_SYSERR;
     }
     next = res;
@@ -736,7 +736,7 @@ LEGACY_SERVICE_get_server_addresses (
            hostname);
       freeaddrinfo (res);
       GNUNET_free (hostname);
-      GNUNET_free_non_null (unixpath);
+      GNUNET_free (unixpath);
       return GNUNET_SYSERR;
     }
     resi = i;
@@ -843,7 +843,7 @@ LEGACY_SERVICE_get_server_addresses (
       ((struct sockaddr_in *) saddrs[i])->sin_port = htons (port);
     }
   }
-  GNUNET_free_non_null (unixpath);
+  GNUNET_free (unixpath);
   *addrs = saddrs;
   *addr_lens = saddrlens;
   return resi;
@@ -1024,7 +1024,7 @@ write_pid_file (struct LEGACY_SERVICE_Context *sctx, pid_t pid)
   {
     LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_ERROR, "access", rdir);
     GNUNET_free (rdir);
-    GNUNET_free_non_null (user);
+    GNUNET_free (user);
     GNUNET_free (pif);
     return GNUNET_SYSERR;
   }
@@ -1034,7 +1034,7 @@ write_pid_file (struct LEGACY_SERVICE_Context *sctx, pid_t pid)
   {
     LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_ERROR, "fopen", pif);
     GNUNET_free (pif);
-    GNUNET_free_non_null (user);
+    GNUNET_free (user);
     return GNUNET_SYSERR;
   }
   if (0 > fprintf (pidfd, "%u", pid))
@@ -1042,7 +1042,7 @@ write_pid_file (struct LEGACY_SERVICE_Context *sctx, pid_t pid)
   GNUNET_break (0 == fclose (pidfd));
   if ((NULL != user) && (0 < strlen (user)))
     GNUNET_DISK_file_change_owner (pif, user);
-  GNUNET_free_non_null (user);
+  GNUNET_free (user);
   GNUNET_free (pif);
   return GNUNET_OK;
 }
@@ -1441,7 +1441,7 @@ LEGACY_SERVICE_run (int argc,
   /* shutdown */
   if ((1 == do_daemonize) && (NULL != sctx.server))
     pid_file_delete (&sctx);
-  GNUNET_free_non_null (sctx.my_handlers);
+  GNUNET_free (sctx.my_handlers);
 
 shutdown:
   if (-1 != sctx.ready_confirm_fd)
@@ -1475,16 +1475,16 @@ shutdown:
   if (NULL != sctx.addrs)
     while (NULL != sctx.addrs[i])
       GNUNET_free_nz (sctx.addrs[i++]);
-  GNUNET_free_non_null (sctx.addrs);
-  GNUNET_free_non_null (sctx.addrlens);
-  GNUNET_free_non_null (logfile);
-  GNUNET_free_non_null (loglev);
+  GNUNET_free (sctx.addrs);
+  GNUNET_free (sctx.addrlens);
+  GNUNET_free (logfile);
+  GNUNET_free (loglev);
   GNUNET_free (cfg_fn);
-  GNUNET_free_non_null (opt_cfg_fn);
-  GNUNET_free_non_null (sctx.v4_denied);
-  GNUNET_free_non_null (sctx.v6_denied);
-  GNUNET_free_non_null (sctx.v4_allowed);
-  GNUNET_free_non_null (sctx.v6_allowed);
+  GNUNET_free (opt_cfg_fn);
+  GNUNET_free (sctx.v4_denied);
+  GNUNET_free (sctx.v6_denied);
+  GNUNET_free (sctx.v4_allowed);
+  GNUNET_free (sctx.v6_allowed);
 
   return err ? GNUNET_SYSERR : sctx.ret;
 }
@@ -1626,7 +1626,7 @@ LEGACY_SERVICE_stop (struct LEGACY_SERVICE_Context *sctx)
   }
   if (NULL != sctx->server)
     GNUNET_SERVER_destroy (sctx->server);
-  GNUNET_free_non_null (sctx->my_handlers);
+  GNUNET_free (sctx->my_handlers);
   if (NULL != sctx->addrs)
   {
     i = 0;
@@ -1634,11 +1634,11 @@ LEGACY_SERVICE_stop (struct LEGACY_SERVICE_Context *sctx)
       GNUNET_free_nz (sctx->addrs[i++]);
     GNUNET_free (sctx->addrs);
   }
-  GNUNET_free_non_null (sctx->addrlens);
-  GNUNET_free_non_null (sctx->v4_denied);
-  GNUNET_free_non_null (sctx->v6_denied);
-  GNUNET_free_non_null (sctx->v4_allowed);
-  GNUNET_free_non_null (sctx->v6_allowed);
+  GNUNET_free (sctx->addrlens);
+  GNUNET_free (sctx->v4_denied);
+  GNUNET_free (sctx->v6_denied);
+  GNUNET_free (sctx->v4_allowed);
+  GNUNET_free (sctx->v6_allowed);
   GNUNET_free (sctx);
 }
 
diff --git a/src/transport/test_http_common.c b/src/transport/test_http_common.c
index 6e31ec85e..fe6e4faa3 100644
--- a/src/transport/test_http_common.c
+++ b/src/transport/test_http_common.c
@@ -32,9 +32,9 @@ clean (struct SplittedHTTPAddress *addr)
 {
   if (NULL == addr)
     return;
-  GNUNET_free_non_null (addr->host);
-  GNUNET_free_non_null (addr->path);
-  GNUNET_free_non_null (addr->protocol);
+  GNUNET_free (addr->host);
+  GNUNET_free (addr->path);
+  GNUNET_free (addr->protocol);
   GNUNET_free (addr);
 }
 
diff --git a/src/transport/test_plugin_hostkey.ecc b/src/transport/test_plugin_hostkey.ecc
index 96c3e7e4e..18641b798 100644
--- a/src/transport/test_plugin_hostkey.ecc
+++ b/src/transport/test_plugin_hostkey.ecc
diff --git a/src/transport/test_transport_api_reliability.c b/src/transport/test_transport_api_reliability.c
index 058d7d8bf..deb943956 100644
--- a/src/transport/test_transport_api_reliability.c
+++ b/src/transport/test_transport_api_reliability.c
@@ -93,10 +93,9 @@ get_size (unsigned int iter)
   /* FreeBSD/OSX etc. Unix DGRAMs do not work
    * with large messages */
   if (0 == strcmp ("unix", ccc->test_plugin))
-    ret = sizeof(struct GNUNET_TRANSPORT_TESTING_TestMessage) + (ret % 1024);
+    return sizeof(struct GNUNET_TRANSPORT_TESTING_TestMessage) + (ret % 1024);
 #endif
-  ret = sizeof(struct GNUNET_TRANSPORT_TESTING_TestMessage) + (ret % 60000);
-  return ret;
+  return sizeof(struct GNUNET_TRANSPORT_TESTING_TestMessage) + (ret % 60000);
 }
 
 
diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf
index c8a5bf0d4..19bff8fcc 100644
--- a/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf
+++ b/src/transport/test_transport_blacklisting_cfg_blp_peer1_full.conf
@@ -9,8 +9,8 @@ TIMEOUT = 5 s
 [transport]
 PLUGINS = tcp
 
-#Peer 1: 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG
-#Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50
+#Peer 1: 4TTC9WBSVP9RJT6DVEZ7E0TDW7TQXC11NR1EMR2F8ARS87WZ2730
+#Peer 2: F7B5NX6KCPG8SAKYSGV0E94Y5NXR9JE3HCGQ5YGH1H04WFQWMWT0
 
-[transport-blacklist-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG]
-DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 =
+[transport-blacklist-4TTC9WBSVP9RJT6DVEZ7E0TDW7TQXC11NR1EMR2F8ARS87WZ2730]
+F7B5NX6KCPG8SAKYSGV0E94Y5NXR9JE3HCGQ5YGH1H04WFQWMWT0 =
diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
index 30b82aebf..79bc90469 100644
--- a/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
+++ b/src/transport/test_transport_blacklisting_cfg_blp_peer1_multiple_plugins.conf
@@ -3,11 +3,11 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
 
 [transport]
-PLUGINS = tcp udp
+PLUGINS = tcp unix
 
-#Peer 1: 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG
-#Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50
+#Peer 1: 4TTC9WBSVP9RJT6DVEZ7E0TDW7TQXC11NR1EMR2F8ARS87WZ2730
+#Peer 2: F7B5NX6KCPG8SAKYSGV0E94Y5NXR9JE3HCGQ5YGH1H04WFQWMWT0
 
-[transport-blacklist-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG]
-DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 = tcp
+[transport-blacklist-4TTC9WBSVP9RJT6DVEZ7E0TDW7TQXC11NR1EMR2F8ARS87WZ2730]
+F7B5NX6KCPG8SAKYSGV0E94Y5NXR9JE3HCGQ5YGH1H04WFQWMWT0 = tcp
 
diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf
index 12c11252e..b328dd5cf 100644
--- a/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf
+++ b/src/transport/test_transport_blacklisting_cfg_blp_peer1_plugin.conf
@@ -5,9 +5,9 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p1/
 [transport]
 PLUGINS = tcp
 
-#Peer 1: 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG
-#Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50
+#Peer 1: 4TTC9WBSVP9RJT6DVEZ7E0TDW7TQXC11NR1EMR2F8ARS87WZ2730
+#Peer 2: F7B5NX6KCPG8SAKYSGV0E94Y5NXR9JE3HCGQ5YGH1H04WFQWMWT0
 
-[transport-blacklist-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG]
-DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50 = tcp
+[transport-blacklist-4TTC9WBSVP9RJT6DVEZ7E0TDW7TQXC11NR1EMR2F8ARS87WZ2730]
+F7B5NX6KCPG8SAKYSGV0E94Y5NXR9JE3HCGQ5YGH1H04WFQWMWT0 = tcp
 
diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf
index 4b449bed8..862209d2c 100644
--- a/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf
+++ b/src/transport/test_transport_blacklisting_cfg_blp_peer2_full.conf
@@ -5,9 +5,8 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
 [transport]
 PLUGINS = tcp
 
-#Peer 1: 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG
-#Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50
-
-[transport-blacklist-DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50]
-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG =
+#Peer 1: 4TTC9WBSVP9RJT6DVEZ7E0TDW7TQXC11NR1EMR2F8ARS87WZ2730
+#Peer 2: F7B5NX6KCPG8SAKYSGV0E94Y5NXR9JE3HCGQ5YGH1H04WFQWMWT0
 
+[transport-blacklist-F7B5NX6KCPG8SAKYSGV0E94Y5NXR9JE3HCGQ5YGH1H04WFQWMWT0]
+4TTC9WBSVP9RJT6DVEZ7E0TDW7TQXC11NR1EMR2F8ARS87WZ2730 =
diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
index 690eb3b76..3134f9d81 100644
--- a/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
+++ b/src/transport/test_transport_blacklisting_cfg_blp_peer2_multiple_plugins.conf
@@ -3,10 +3,10 @@
 GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
 
 [transport]
-PLUGINS = tcp udp
+PLUGINS = tcp unix
 
-#Peer 1: 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG
-#Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50
+#Peer 1: 4TTC9WBSVP9RJT6DVEZ7E0TDW7TQXC11NR1EMR2F8ARS87WZ2730
+#Peer 2: F7B5NX6KCPG8SAKYSGV0E94Y5NXR9JE3HCGQ5YGH1H04WFQWMWT0
 
-[transport-blacklist-DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50]
-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG = tcp
+[transport-blacklist-F7B5NX6KCPG8SAKYSGV0E94Y5NXR9JE3HCGQ5YGH1H04WFQWMWT0]
+4TTC9WBSVP9RJT6DVEZ7E0TDW7TQXC11NR1EMR2F8ARS87WZ2730 = tcp
diff --git a/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf b/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf
index 00d3343e8..dd582125d 100644
--- a/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf
+++ b/src/transport/test_transport_blacklisting_cfg_blp_peer2_plugin.conf
@@ -5,8 +5,8 @@ GNUNET_TEST_HOME = $GNUNET_TMP/test-transport/api-tcp-p2/
 [transport]
 PLUGINS = tcp
 
-#Peer 1: 6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG
-#Peer 2: DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50
+#Peer 1: 4TTC9WBSVP9RJT6DVEZ7E0TDW7TQXC11NR1EMR2F8ARS87WZ2730
+#Peer 2: F7B5NX6KCPG8SAKYSGV0E94Y5NXR9JE3HCGQ5YGH1H04WFQWMWT0
 
-[transport-blacklist-DK5WZKKDHH06BH1H0DE0Z8CPBTG9AD8P85SF02WW3285AT3V0V50]
-6YNBKM6TTK64FAG9DF0292AW5JA9CCAC04JTY0HF8XHP635HPBBG = tcp
+[transport-blacklist-F7B5NX6KCPG8SAKYSGV0E94Y5NXR9JE3HCGQ5YGH1H04WFQWMWT0]
+4TTC9WBSVP9RJT6DVEZ7E0TDW7TQXC11NR1EMR2F8ARS87WZ2730 = tcp
diff --git a/src/transport/transport-testing-main.c b/src/transport/transport-testing-main.c
index 8c35ff252..20c58eeee 100644
--- a/src/transport/transport-testing-main.c
+++ b/src/transport/transport-testing-main.c
@@ -604,7 +604,7 @@ GNUNET_TRANSPORT_TESTING_main_ (const char *argv0,
   for (unsigned int i = 0; i < num_peers; i++)
     GNUNET_free (cfg_names[i]);
   GNUNET_free (test_source);
-  GNUNET_free_non_null (test_plugin);
+  GNUNET_free (test_plugin);
   GNUNET_free (test_name);
   return ret;
 }
diff --git a/src/transport/transport-testing.c b/src/transport/transport-testing.c
index 06dbe891a..2da193b31 100644
--- a/src/transport/transport-testing.c
+++ b/src/transport/transport-testing.c
@@ -349,7 +349,7 @@ get_hello (void *cb_cls,
   GNUNET_assert (0 == memcmp (&hello_id,
                               &p->id,
                               sizeof(hello_id)));
-  GNUNET_free_non_null (p->hello);
+  GNUNET_free (p->hello);
   p->hello = (struct GNUNET_HELLO_Message *) GNUNET_copy_message (message);
 
   if (NULL != p->start_cb)
@@ -460,10 +460,10 @@ GNUNET_TRANSPORT_TESTING_start_peer (struct
          cfgname,
          emsg);
     GNUNET_TRANSPORT_TESTING_stop_peer (p);
-    GNUNET_free_non_null (emsg);
+    GNUNET_free (emsg);
     return NULL;
   }
-  GNUNET_free_non_null (emsg);
+  GNUNET_free (emsg);
   if (GNUNET_OK != GNUNET_TESTING_peer_start (p->peer))
   {
     LOG (GNUNET_ERROR_TYPE_ERROR,
diff --git a/src/transport/transport-testing2.c b/src/transport/transport-testing2.c
index cbe1159f3..10b064241 100644
--- a/src/transport/transport-testing2.c
+++ b/src/transport/transport-testing2.c
@@ -970,6 +970,7 @@ shutdown_nat (void *cls)
   shutdown_process (proc);
 }
 
+
 /**
  * @brief Task run at shutdown to kill the resolver process
  *
@@ -982,6 +983,7 @@ shutdown_resolver (void *cls)
   shutdown_process (proc);
 }
 
+
 static void
 resolver_start (struct
                 GNUNET_TRANSPORT_TESTING_TransportCommunicatorHandle *tc_h)
@@ -990,16 +992,17 @@ resolver_start (struct
 
   LOG (GNUNET_ERROR_TYPE_DEBUG, "resolver_start\n");
   binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver");
-  tc_h->resolver_proc = GNUNET_OS_start_process (GNUNET_YES,
-                                                 GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
-                                                 NULL,
-                                                 NULL,
-                                                 NULL,
-                                                 binary,
-                                                 "gnunet-service-resolver",
-                                                 "-c",
-                                                 tc_h->cfg_filename,
-                                                 NULL);
+  tc_h->resolver_proc = GNUNET_OS_start_process (
+    GNUNET_OS_INHERIT_STD_OUT_AND_ERR
+    | GNUNET_OS_USE_PIPE_CONTROL,
+    NULL,
+    NULL,
+    NULL,
+    binary,
+    "gnunet-service-resolver",
+    "-c",
+    tc_h->cfg_filename,
+    NULL);
   if (NULL == tc_h->resolver_proc)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Failed to start resolver service!");
@@ -1054,8 +1057,8 @@ nat_start (
 
   LOG (GNUNET_ERROR_TYPE_DEBUG, "nat_start\n");
   binary = GNUNET_OS_get_libexec_binary_path ("gnunet-service-nat");
-  tc_h->nat_proc = GNUNET_OS_start_process (GNUNET_YES,
-                                            GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+  tc_h->nat_proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR
+                                            | GNUNET_OS_USE_PIPE_CONTROL,
                                             NULL,
                                             NULL,
                                             NULL,
@@ -1073,6 +1076,7 @@ nat_start (
   GNUNET_free (binary);
 }
 
+
 /**
  * @brief Start communicator part of transport service and communicator
  *
diff --git a/src/transport/transport.h b/src/transport/transport.h
index a64ffd5c6..dbae4ecfb 100644
--- a/src/transport/transport.h
+++ b/src/transport/transport.h
@@ -903,7 +903,6 @@ struct GNUNET_TRANSPORT_UpdateQueueMessage
 };
 
 
-
 /**
  * Remove queue, it is no longer available.
  */
diff --git a/src/transport/transport_api2_communication.c b/src/transport/transport_api2_communication.c
index cfa144415..d1e28cc36 100644
--- a/src/transport/transport_api2_communication.c
+++ b/src/transport/transport_api2_communication.c
@@ -420,6 +420,7 @@ send_add_queue (struct GNUNET_TRANSPORT_QueueHandle *qh)
   GNUNET_MQ_send (qh->ch->mq, env);
 }
 
+
 /**
  * Send message to the transport service about queue @a qh
  * updated.
@@ -446,7 +447,6 @@ send_update_queue (struct GNUNET_TRANSPORT_QueueHandle *qh)
 }
 
 
-
 /**
  * Send message to the transport service about queue @a qh
  * being no longer available.
@@ -1033,7 +1033,6 @@ GNUNET_TRANSPORT_communicator_mq_update (
 }
 
 
-
 /**
  * Notify transport service that an MQ became unavailable due to a
  * disconnect or timeout.
diff --git a/src/transport/transport_api2_core.c b/src/transport/transport_api2_core.c
index cd8bacf3d..002af81fc 100644
--- a/src/transport/transport_api2_core.c
+++ b/src/transport/transport_api2_core.c
@@ -762,7 +762,7 @@ GNUNET_TRANSPORT_core_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
   reconnect (h);
   if (NULL == h->mq)
   {
-    GNUNET_free_non_null (h->handlers);
+    GNUNET_free (h->handlers);
     GNUNET_free (h);
     return NULL;
   }
@@ -792,7 +792,7 @@ GNUNET_TRANSPORT_core_disconnect (struct GNUNET_TRANSPORT_CoreHandle *handle)
   }
   GNUNET_CONTAINER_multipeermap_destroy (handle->neighbours);
   handle->neighbours = NULL;
-  GNUNET_free_non_null (handle->handlers);
+  GNUNET_free (handle->handlers);
   handle->handlers = NULL;
   GNUNET_free (handle);
 }
diff --git a/src/transport/transport_api_core.c b/src/transport/transport_api_core.c
index 5d841fa10..7d4b415bd 100644
--- a/src/transport/transport_api_core.c
+++ b/src/transport/transport_api_core.c
@@ -622,13 +622,14 @@ handle_send_ok (void *cls, const struct SendOkMessage *okm)
   struct Neighbour *n;
   uint32_t bytes_msg;
   uint32_t bytes_physical;
+  uint16_t success =  ntohs (okm->success);
 
-  bytes_msg = ntohl (okm->bytes_msg);
+  bytes_msg = ntohs (okm->bytes_msg);
   bytes_physical = ntohl (okm->bytes_physical);
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Receiving SEND_OK message, transmission to %s %s.\n",
        GNUNET_i2s (&okm->peer),
-       ntohl (okm->success) == GNUNET_OK ? "succeeded" : "failed");
+       success == GNUNET_OK ? "succeeded" : "failed");
   n = neighbour_find (h, &okm->peer);
   if (NULL == n)
   {
@@ -891,7 +892,7 @@ GNUNET_TRANSPORT_core_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
   reconnect (h);
   if (NULL == h->mq)
   {
-    GNUNET_free_non_null (h->handlers);
+    GNUNET_free (h->handlers);
     GNUNET_free (h);
     return NULL;
   }
@@ -922,7 +923,7 @@ GNUNET_TRANSPORT_core_disconnect (struct GNUNET_TRANSPORT_CoreHandle *handle)
   }
   GNUNET_CONTAINER_multipeermap_destroy (handle->neighbours);
   handle->neighbours = NULL;
-  GNUNET_free_non_null (handle->handlers);
+  GNUNET_free (handle->handlers);
   handle->handlers = NULL;
   GNUNET_free (handle);
 }
diff --git a/src/util/bio.c b/src/util/bio.c
index ce15f073b..39050bb87 100644
--- a/src/util/bio.c
+++ b/src/util/bio.c
@@ -171,7 +171,7 @@ GNUNET_BIO_read_close (struct GNUNET_BIO_ReadHandle *h, char **emsg)
   if (NULL != emsg)
     *emsg = h->emsg;
   else
-    GNUNET_free_non_null (h->emsg);
+    GNUNET_free (h->emsg);
   switch (h->type)
   {
   case IO_FILE:
@@ -260,7 +260,7 @@ read_from_buffer (struct GNUNET_BIO_ReadHandle *h,
                   char *result,
                   size_t len)
 {
-  if (h->size < len || h->size - h->pos < len)
+  if ((h->size < len) || (h->size - h->pos < len))
   {
     GNUNET_asprintf (&h->emsg,
                      _ ("Error while reading `%s' from buffer: %s"),
@@ -345,7 +345,7 @@ GNUNET_BIO_read_string (struct GNUNET_BIO_ReadHandle *h,
       GNUNET_asprintf (&h->emsg,
                        _ ("Error reading length of string `%s'"),
                        what);
-    GNUNET_free_non_null (tmp);
+    GNUNET_free (tmp);
     return GNUNET_SYSERR;
   }
   if (0 == big)
@@ -431,6 +431,7 @@ GNUNET_BIO_read_meta_data (struct GNUNET_BIO_ReadHandle *h,
   return GNUNET_OK;
 }
 
+
 /**
  * Read a float.
  *
@@ -439,9 +440,9 @@ GNUNET_BIO_read_meta_data (struct GNUNET_BIO_ReadHandle *h,
  * @param f address of float to read
  */
 int
-GNUNET_BIO_read_float(struct GNUNET_BIO_ReadHandle *h,
-                      const char *what,
-                      float *f)
+GNUNET_BIO_read_float (struct GNUNET_BIO_ReadHandle *h,
+                       const char *what,
+                       float *f)
 {
   int32_t *i = (int32_t *) f;
   return GNUNET_BIO_read_int32 (h, what, i);
@@ -456,9 +457,9 @@ GNUNET_BIO_read_float(struct GNUNET_BIO_ReadHandle *h,
  * @param f address of double to read
  */
 int
-GNUNET_BIO_read_double(struct GNUNET_BIO_ReadHandle *h,
-                       const char *what,
-                       double *f)
+GNUNET_BIO_read_double (struct GNUNET_BIO_ReadHandle *h,
+                        const char *what,
+                        double *f)
 {
   int64_t *i = (int64_t *) f;
   return GNUNET_BIO_read_int64 (h, what, i);
@@ -612,7 +613,7 @@ GNUNET_BIO_write_close (struct GNUNET_BIO_WriteHandle *h, char **emsg)
   if (NULL != emsg)
     *emsg = h->emsg;
   else
-    GNUNET_free_non_null (h->emsg);
+    GNUNET_free (h->emsg);
   switch (h->type)
   {
   case IO_FILE:
@@ -623,7 +624,7 @@ GNUNET_BIO_write_close (struct GNUNET_BIO_WriteHandle *h, char **emsg)
       if (NULL != emsg)
         *emsg = h->emsg;
       else
-        GNUNET_free_non_null (h->emsg);
+        GNUNET_free (h->emsg);
       err = GNUNET_SYSERR;
     }
     else
@@ -663,7 +664,7 @@ GNUNET_BIO_flush (struct GNUNET_BIO_WriteHandle *h)
   {
     GNUNET_DISK_file_close (h->fd);
     h->fd = NULL;
-    GNUNET_free_non_null (h->emsg);
+    GNUNET_free (h->emsg);
     GNUNET_asprintf (&h->emsg, _ ("Unable to flush buffer to file"));
     return GNUNET_SYSERR;
   }
@@ -692,13 +693,13 @@ GNUNET_BIO_get_buffer_contents (struct GNUNET_BIO_WriteHandle *h,
 {
   if (IO_BUFFER != h->type)
     return GNUNET_SYSERR;
-  if (NULL == contents || NULL == size)
+  if ((NULL == contents) || (NULL == size))
     return GNUNET_SYSERR;
   int ret = (NULL != h->emsg) ? GNUNET_SYSERR : GNUNET_OK;
   if (NULL != emsg)
     *emsg = h->emsg;
   else
-    GNUNET_free_non_null (h->emsg);
+    GNUNET_free (h->emsg);
   *contents = GNUNET_buffer_reap ((struct GNUNET_Buffer *) h->buffer, size);
   return ret;
 }
@@ -750,7 +751,7 @@ write_to_file (struct GNUNET_BIO_WriteHandle *h,
                        _ ("Error while writing `%s' to file: %s"),
                        what,
                        tmp);
-      GNUNET_free_non_null (tmp);
+      GNUNET_free (tmp);
       return GNUNET_SYSERR;
     }
   }
@@ -870,7 +871,7 @@ GNUNET_BIO_write_meta_data (struct GNUNET_BIO_WriteHandle *h,
   if (-1 == size)
   {
     GNUNET_free (buf);
-    GNUNET_free_non_null (h->emsg);
+    GNUNET_free (h->emsg);
     GNUNET_asprintf (&h->emsg,
                      _ ("Failed to serialize metadata `%s'"),
                      what);
@@ -897,9 +898,9 @@ GNUNET_BIO_write_meta_data (struct GNUNET_BIO_WriteHandle *h,
  * @param f float to write
  */
 int
-GNUNET_BIO_write_float(struct GNUNET_BIO_WriteHandle *h,
-                       const char *what,
-                       float f)
+GNUNET_BIO_write_float (struct GNUNET_BIO_WriteHandle *h,
+                        const char *what,
+                        float f)
 {
   int32_t i = f;
   return GNUNET_BIO_write_int32 (h, what, i);
@@ -914,9 +915,9 @@ GNUNET_BIO_write_float(struct GNUNET_BIO_WriteHandle *h,
  * @param f double to write
  */
 int
-GNUNET_BIO_write_double(struct GNUNET_BIO_WriteHandle *h,
-                        const char *what,
-                        double f)
+GNUNET_BIO_write_double (struct GNUNET_BIO_WriteHandle *h,
+                         const char *what,
+                         double f)
 {
   int64_t i = f;
   return GNUNET_BIO_write_int64 (h, what, i);
@@ -1196,7 +1197,7 @@ GNUNET_BIO_read_spec_int64 (const char *what,
  * @param f address of float to read
  */
 struct GNUNET_BIO_ReadSpec
-GNUNET_BIO_read_spec_float(const char *what, float *f)
+GNUNET_BIO_read_spec_float (const char *what, float *f)
 {
   struct GNUNET_BIO_ReadSpec rs = {
     .rh = &read_spec_handler_int32,
@@ -1216,7 +1217,7 @@ GNUNET_BIO_read_spec_float(const char *what, float *f)
  * @param f address of double to read
  */
 struct GNUNET_BIO_ReadSpec
-GNUNET_BIO_read_spec_double(const char *what, double *f)
+GNUNET_BIO_read_spec_double (const char *what, double *f)
 {
   struct GNUNET_BIO_ReadSpec rs = {
     .rh = &read_spec_handler_int64,
@@ -1243,7 +1244,7 @@ GNUNET_BIO_read_spec_commit (struct GNUNET_BIO_ReadHandle *h,
 {
   int ret = GNUNET_OK;
 
-  for (size_t i=0; NULL!=rs[i].rh; ++i)
+  for (size_t i = 0; NULL!=rs[i].rh; ++i)
   {
     ret = rs[i].rh (rs[i].cls, h, rs[i].what, rs[i].target, rs[i].size);
     if (GNUNET_OK != ret)
@@ -1490,7 +1491,7 @@ GNUNET_BIO_write_spec_int64 (const char *what,
  * @return the write spec
  */
 struct GNUNET_BIO_WriteSpec
-GNUNET_BIO_write_spec_float(const char *what, float *f)
+GNUNET_BIO_write_spec_float (const char *what, float *f)
 {
   struct GNUNET_BIO_WriteSpec ws = {
     .wh = &write_spec_handler_int32,
@@ -1512,7 +1513,7 @@ GNUNET_BIO_write_spec_float(const char *what, float *f)
  * @return the write spec
  */
 struct GNUNET_BIO_WriteSpec
-GNUNET_BIO_write_spec_double(const char *what, double *f)
+GNUNET_BIO_write_spec_double (const char *what, double *f)
 {
   struct GNUNET_BIO_WriteSpec ws = {
     .wh = &write_spec_handler_int64,
@@ -1540,7 +1541,7 @@ GNUNET_BIO_write_spec_commit (struct GNUNET_BIO_WriteHandle *h,
 {
   int ret = GNUNET_OK;
 
-  for (size_t i=0; NULL!=ws[i].wh; ++i)
+  for (size_t i = 0; NULL!=ws[i].wh; ++i)
   {
     ret = ws[i].wh (ws[i].cls, h, ws[i].what, ws[i].source, ws[i].source_size);
     if (GNUNET_OK != ret)
diff --git a/src/util/buffer.c b/src/util/buffer.c
index c865f6307..d0261889e 100644
--- a/src/util/buffer.c
+++ b/src/util/buffer.c
@@ -162,7 +162,7 @@ GNUNET_buffer_reap (struct GNUNET_Buffer *buf, size_t *size)
 void
 GNUNET_buffer_clear (struct GNUNET_Buffer *buf)
 {
-  GNUNET_free_non_null (buf->mem);
+  GNUNET_free (buf->mem);
   memset (buf, 0, sizeof (struct GNUNET_Buffer));
 }
 
diff --git a/src/util/client.c b/src/util/client.c
index a7b1a2a0f..86dabe664 100644
--- a/src/util/client.c
+++ b/src/util/client.c
@@ -422,7 +422,7 @@ connection_client_destroy_impl (struct GNUNET_MQ_Handle *mq,
   }
   cancel_aps (cstate);
   GNUNET_free (cstate->service_name);
-  GNUNET_free_non_null (cstate->hostname);
+  GNUNET_free (cstate->hostname);
   GNUNET_MST_destroy (cstate->mst);
   GNUNET_free (cstate);
 }
@@ -563,7 +563,7 @@ try_unixpath (const char *service_name,
     if (NULL != sock)
       GNUNET_NETWORK_socket_close (sock);
   }
-  GNUNET_free_non_null (unixpath);
+  GNUNET_free (unixpath);
 #endif
   return NULL;
 }
@@ -747,7 +747,7 @@ test_service_configuration (const char *service_name,
                                _ ("not a valid filename"));
     return GNUNET_SYSERR;   /* UNIXPATH specified but invalid! */
   }
-  GNUNET_free_non_null (unixpath);
+  GNUNET_free (unixpath);
 #endif
 
   if ((GNUNET_YES ==
@@ -768,7 +768,7 @@ test_service_configuration (const char *service_name,
                                               &hostname)) &&
       (0 != strlen (hostname)))
     ret = GNUNET_OK;
-  GNUNET_free_non_null (hostname);
+  GNUNET_free (hostname);
   return ret;
 }
 
@@ -1043,7 +1043,7 @@ GNUNET_CLIENT_test (const struct GNUNET_CONFIGURATION_Handle *cfg,
     /* service running remotely */
     ret = GNUNET_OK;
   }
-  GNUNET_free_non_null (hostname);
+  GNUNET_free (hostname);
   return ret;
 }
 
diff --git a/src/util/common_allocation.c b/src/util/common_allocation.c
index fd91e23b2..4aad49777 100644
--- a/src/util/common_allocation.c
+++ b/src/util/common_allocation.c
@@ -323,13 +323,12 @@ GNUNET_xrealloc_ (void *ptr, size_t n, const char *filename, int linenumber)
  * want to keep track of allocations.
  *
  * @param ptr the pointer to free
- * @param filename where in the code was the call to GNUNET_free
- * @param linenumber where in the code was the call to GNUNET_free
+ * @param filename where in the code was the call to GNUNET_free()
+ * @param linenumber where in the code was the call to GNUNET_free()
  */
 void
 GNUNET_xfree_ (void *ptr, const char *filename, int linenumber)
 {
-  GNUNET_assert_at (NULL != ptr, filename, linenumber);
 #ifdef W32_MEM_LIMIT
   ptr = &((size_t *) ptr)[-1];
   mem_used -= *((size_t *) ptr);
diff --git a/src/util/common_logging.c b/src/util/common_logging.c
index 3894cdda1..b30175543 100644
--- a/src/util/common_logging.c
+++ b/src/util/common_logging.c
@@ -715,9 +715,9 @@ GNUNET_log_setup (const char *comp,
 #if ! defined(GNUNET_CULL_LOGGING)
   parse_all_definitions ();
 #endif
-  GNUNET_free_non_null (component);
+  GNUNET_free (component);
   GNUNET_asprintf (&component, "%s-%d", comp, getpid ());
-  GNUNET_free_non_null (component_nopid);
+  GNUNET_free (component_nopid);
   component_nopid = GNUNET_strdup (comp);
 
   env_logfile = getenv ("GNUNET_FORCE_LOGFILE");
@@ -725,7 +725,7 @@ GNUNET_log_setup (const char *comp,
     logfile = env_logfile;
   if (NULL == logfile)
     return GNUNET_OK;
-  GNUNET_free_non_null (log_file_name);
+  GNUNET_free (log_file_name);
   log_file_name = GNUNET_STRINGS_filename_expand (logfile);
   if (NULL == log_file_name)
     return GNUNET_SYSERR;
diff --git a/src/util/configuration.c b/src/util/configuration.c
index 7ed87cc1e..26beacaff 100644
--- a/src/util/configuration.c
+++ b/src/util/configuration.c
@@ -286,7 +286,7 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
   line_orig = NULL;
   while (r_bytes < size)
   {
-    GNUNET_free_non_null (line_orig);
+    GNUNET_free (line_orig);
     /* fgets-like behaviour on buffer */
     to_read = size - r_bytes;
     pos = memchr (&mem[r_bytes], '\n', to_read);
@@ -404,7 +404,7 @@ GNUNET_CONFIGURATION_deserialize (struct GNUNET_CONFIGURATION_Handle *cfg,
     ret = GNUNET_SYSERR;
     break;
   }
-  GNUNET_free_non_null (line_orig);
+  GNUNET_free (line_orig);
   GNUNET_free (section);
   GNUNET_assert ((GNUNET_OK != ret) || (r_bytes == size));
   return ret;
@@ -734,7 +734,7 @@ GNUNET_CONFIGURATION_remove_section (struct GNUNET_CONFIGURATION_Handle *cfg,
       {
         spos->entries = ent->next;
         GNUNET_free (ent->key);
-        GNUNET_free_non_null (ent->val);
+        GNUNET_free (ent->val);
         GNUNET_free (ent);
         cfg->dirty = GNUNET_YES;
       }
@@ -926,13 +926,13 @@ GNUNET_CONFIGURATION_set_value_string (struct GNUNET_CONFIGURATION_Handle *cfg,
   {
     if (NULL == value)
     {
-      GNUNET_free_non_null (e->val);
+      GNUNET_free (e->val);
       e->val = NULL;
     }
     else
     {
       nv = GNUNET_strdup (value);
-      GNUNET_free_non_null (e->val);
+      GNUNET_free (e->val);
       e->val = nv;
     }
     return;
@@ -1383,7 +1383,7 @@ expand_dollar (const struct GNUNET_CONFIGURATION_Handle *cfg,
   result = GNUNET_malloc (strlen (prefix) + strlen (post) + 1);
   strcpy (result, prefix);
   strcat (result, post);
-  GNUNET_free_non_null (def);
+  GNUNET_free (def);
   GNUNET_free (prefix);
   GNUNET_free (orig);
   return result;
@@ -1810,4 +1810,45 @@ GNUNET_CONFIGURATION_load_from (struct GNUNET_CONFIGURATION_Handle *cfg,
 }
 
 
+/**
+ * Return GNUnet's default configuration.  A new configuration is allocated
+ * each time and it's up to the caller to destroy it when done.  This function
+ * returns GNUnet's configuration even when #GNUNET_OS_init has been called
+ * with a value different from #GNUNET_OS_project_data_default.
+ *
+ * @return a freshly allocated configuration
+ */
+struct GNUNET_CONFIGURATION_Handle *
+GNUNET_CONFIGURATION_default (void)
+{
+  const struct GNUNET_OS_ProjectData *pd = GNUNET_OS_project_data_get ();
+  const struct GNUNET_OS_ProjectData *dpd = GNUNET_OS_project_data_default ();
+
+  GNUNET_OS_init (dpd);
+
+  struct GNUNET_CONFIGURATION_Handle *cfg = GNUNET_CONFIGURATION_create ();
+  const char *xdg = getenv ("XDG_CONFIG_HOME");
+  char *cfgname = NULL;
+
+  if (NULL != xdg)
+    GNUNET_asprintf (&cfgname, "%s/%s", xdg, pd->config_file);
+  else
+    cfgname = GNUNET_strdup (pd->user_config_file);
+
+  if (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg, cfgname))
+  {
+    GNUNET_OS_init (pd);
+    GNUNET_CONFIGURATION_destroy (cfg);
+    GNUNET_free (cfgname);
+    return NULL;
+  }
+
+  GNUNET_free (cfgname);
+
+  GNUNET_OS_init (pd);
+
+  return cfg;
+}
+
+
 /* end of configuration.c */
diff --git a/src/util/container_bloomfilter.c b/src/util/container_bloomfilter.c
index eca651862..d7460043d 100644
--- a/src/util/container_bloomfilter.c
+++ b/src/util/container_bloomfilter.c
@@ -707,7 +707,7 @@ GNUNET_CONTAINER_bloomfilter_free (struct GNUNET_CONTAINER_BloomFilter *bf)
     return;
   if (bf->fh != NULL)
     GNUNET_DISK_file_close (bf->fh);
-  GNUNET_free_non_null (bf->filename);
+  GNUNET_free (bf->filename);
   GNUNET_free (bf->bitArray);
   GNUNET_free (bf);
 }
diff --git a/src/util/container_meta_data.c b/src/util/container_meta_data.c
index ad362408e..b66a7b258 100644
--- a/src/util/container_meta_data.c
+++ b/src/util/container_meta_data.c
@@ -217,9 +217,9 @@ GNUNET_CONTAINER_meta_data_create ()
 static void
 meta_item_free (struct MetaItem *mi)
 {
-  GNUNET_free_non_null (mi->plugin_name);
-  GNUNET_free_non_null (mi->mime_type);
-  GNUNET_free_non_null (mi->data);
+  GNUNET_free (mi->plugin_name);
+  GNUNET_free (mi->mime_type);
+  GNUNET_free (mi->data);
   GNUNET_free (mi);
 }
 
@@ -258,7 +258,7 @@ GNUNET_CONTAINER_meta_data_destroy (struct GNUNET_CONTAINER_MetaData *md)
     GNUNET_CONTAINER_DLL_remove (md->items_head, md->items_tail, pos);
     meta_item_free (pos);
   }
-  GNUNET_free_non_null (md->sbuf);
+  GNUNET_free (md->sbuf);
   GNUNET_free (md);
 }
 
@@ -280,7 +280,7 @@ GNUNET_CONTAINER_meta_data_clear (struct GNUNET_CONTAINER_MetaData *md)
     GNUNET_CONTAINER_DLL_remove (md->items_head, md->items_tail, mi);
     meta_item_free (mi);
   }
-  GNUNET_free_non_null (md->sbuf);
+  GNUNET_free (md->sbuf);
   memset (md, 0, sizeof(struct GNUNET_CONTAINER_MetaData));
 }
 
@@ -976,7 +976,7 @@ GNUNET_CONTAINER_meta_data_serialize (const struct GNUNET_CONTAINER_MetaData
     if (NULL != pos->mime_type)
       left -= strlen (pos->mime_type) + 1;
 
-    GNUNET_free_non_null (cdata);
+    GNUNET_free (cdata);
     cdata = NULL;
 
     i++;
@@ -1180,7 +1180,7 @@ GNUNET_CONTAINER_meta_data_deserialize (const char *input, size_t size)
                                        ntohl (ent.type), format, mime_type,
                                        meta_data, dlen);
   }
-  GNUNET_free_non_null (data);
+  GNUNET_free (data);
   return md;
 }
 
diff --git a/src/util/crypto_ecc.c b/src/util/crypto_ecc.c
index e1608ae55..019dbe94e 100644
--- a/src/util/crypto_ecc.c
+++ b/src/util/crypto_ecc.c
@@ -141,7 +141,7 @@ decode_private_ecdsa_key (const struct GNUNET_CRYPTO_EcdsaPrivateKey *priv)
   int rc;
   uint8_t d[32];
 
-  for (size_t i=0; i<32; i++)
+  for (size_t i = 0; i<32; i++)
     d[i] = priv->d[31 - i];
 
   rc = gcry_sexp_build (&result,
@@ -195,7 +195,7 @@ GNUNET_CRYPTO_eddsa_key_get_public (
   struct GNUNET_CRYPTO_EddsaPublicKey *pub)
 {
   unsigned char pk[crypto_sign_PUBLICKEYBYTES];
-  unsigned char sk[crypto_sign_SECRETKEYBYTES]; 
+  unsigned char sk[crypto_sign_SECRETKEYBYTES];
 
   BENCHMARK_START (eddsa_key_get_public);
   GNUNET_assert (0 == crypto_sign_seed_keypair (pk, sk, priv->d));
@@ -929,7 +929,7 @@ GNUNET_CRYPTO_ecdsa_private_key_derive (
 
   h = derive_h (&pub, label, context);
   /* Convert to big endian for libgcrypt */
-  for (size_t i=0; i < 32; i++)
+  for (size_t i = 0; i < 32; i++)
     dc[i] = priv->d[31 - i];
   GNUNET_CRYPTO_mpi_scan_unsigned (&x, dc, sizeof(dc));
   d = gcry_mpi_new (256);
@@ -941,9 +941,9 @@ GNUNET_CRYPTO_ecdsa_private_key_derive (
   ret = GNUNET_new (struct GNUNET_CRYPTO_EcdsaPrivateKey);
   GNUNET_CRYPTO_mpi_print_unsigned (dc, sizeof(dc), d);
   /* Convert to big endian for libgcrypt */
-  for (size_t i=0; i < 32; i++)
+  for (size_t i = 0; i < 32; i++)
     ret->d[i] = dc[31 - i];
-  sodium_memzero(dc, sizeof(dc));
+  sodium_memzero (dc, sizeof(dc));
   gcry_mpi_release (d);
   return ret;
 }
diff --git a/src/util/crypto_hash.c b/src/util/crypto_hash.c
index 622953476..0dbe9dbe8 100644
--- a/src/util/crypto_hash.c
+++ b/src/util/crypto_hash.c
@@ -250,12 +250,13 @@ GNUNET_CRYPTO_hash_to_aes_key (const struct GNUNET_HashCode *hc,
  */
 int
 GNUNET_CRYPTO_hash_get_bit_ltr (const struct GNUNET_HashCode *code,
-                            unsigned int bit)
+                                unsigned int bit)
 {
   GNUNET_assert (bit < 8 * sizeof(struct GNUNET_HashCode));
   return (((unsigned char *) code)[bit >> 3] & (128 >> (bit & 7))) > 0;
 }
 
+
 /**
  * Obtain a bit from a hashcode.
  * @param code the GNUNET_CRYPTO_hash to index bit-wise
@@ -272,7 +273,6 @@ GNUNET_CRYPTO_hash_get_bit_rtl (const struct GNUNET_HashCode *code,
 }
 
 
-
 /**
  * Determine how many low order bits match in two
  * `struct GNUNET_HashCode`s.  i.e. - 010011 and 011111 share
diff --git a/src/util/crypto_kdf.c b/src/util/crypto_kdf.c
index 1b3bd686f..4f3830308 100644
--- a/src/util/crypto_kdf.c
+++ b/src/util/crypto_kdf.c
@@ -62,7 +62,8 @@ GNUNET_CRYPTO_kdf_v (void *result,
    * hash function."
    *
    * http://eprint.iacr.org/2010/264
-   */return GNUNET_CRYPTO_hkdf_v (result,
+   *///
+  return GNUNET_CRYPTO_hkdf_v (result,
                                out_len,
                                GCRY_MD_SHA512,
                                GCRY_MD_SHA256,
@@ -142,7 +143,6 @@ GNUNET_CRYPTO_kdf_mod_mpi (gcry_mpi_t *r,
   {
     /* Ain't clear if n is always divisible by 8 */
     uint8_t buf[ (nbits - 1) / 8 + 1 ];
-
     uint16_t ctr_nbo = htons (ctr);
 
     rc = GNUNET_CRYPTO_kdf (buf,
diff --git a/src/util/crypto_mpi.c b/src/util/crypto_mpi.c
index 099921611..6df47c7e1 100644
--- a/src/util/crypto_mpi.c
+++ b/src/util/crypto_mpi.c
@@ -157,8 +157,8 @@ GNUNET_CRYPTO_mpi_scan_unsigned (gcry_mpi_t *result,
  */
 void
 GNUNET_CRYPTO_mpi_scan_unsigned_le (gcry_mpi_t *result,
-                                 const void *data,
-                                 size_t size)
+                                    const void *data,
+                                    size_t size)
 {
   int rc;
 
diff --git a/src/util/crypto_rsa.c b/src/util/crypto_rsa.c
index cb4640d48..b12ec7434 100644
--- a/src/util/crypto_rsa.c
+++ b/src/util/crypto_rsa.c
@@ -1301,7 +1301,8 @@ GNUNET_CRYPTO_rsa_verify (const struct GNUNET_HashCode *hash,
      * so the exchange is being malicious in an unfamilair way, maybe
      * just trying to crash us.  Arguably, we've only an internal error
      * though because we should've detected this in our previous call
-     * to GNUNET_CRYPTO_rsa_unblind. */return GNUNET_NO;
+     * to GNUNET_CRYPTO_rsa_unblind. *///
+    return GNUNET_NO;
   }
 
   data = mpi_to_sexp (r);
diff --git a/src/util/disk.c b/src/util/disk.c
index 9018aa955..6560726ea 100644
--- a/src/util/disk.c
+++ b/src/util/disk.c
@@ -1451,33 +1451,23 @@ GNUNET_DISK_file_sync (const struct GNUNET_DISK_FileHandle *h)
 /**
  * Creates an interprocess channel
  *
- * @param blocking_read creates an asynchronous pipe for reading if set to GNUNET_NO
- * @param blocking_write creates an asynchronous pipe for writing if set to GNUNET_NO
- * @param inherit_read inherit the parent processes stdin (only for windows)
- * @param inherit_write inherit the parent processes stdout (only for windows)
+ * @param pf how to configure the pipe
  * @return handle to the new pipe, NULL on error
  */
 struct GNUNET_DISK_PipeHandle *
-GNUNET_DISK_pipe (int blocking_read,
-                  int blocking_write,
-                  int inherit_read,
-                  int inherit_write)
+GNUNET_DISK_pipe (enum GNUNET_DISK_PipeFlags pf)
 {
   int fd[2];
-  int ret;
-  int eno;
 
-  (void) inherit_read;
-  (void) inherit_write;
-  ret = pipe (fd);
-  if (ret == -1)
+  if (-1 == pipe (fd))
   {
-    eno = errno;
+    int eno = errno;
+
     LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "pipe");
     errno = eno;
     return NULL;
   }
-  return GNUNET_DISK_pipe_from_fd (blocking_read, blocking_write, fd);
+  return GNUNET_DISK_pipe_from_fd (pf, fd);
 }
 
 
@@ -1485,29 +1475,26 @@ GNUNET_DISK_pipe (int blocking_read,
  * Creates a pipe object from a couple of file descriptors.
  * Useful for wrapping existing pipe FDs.
  *
- * @param blocking_read creates an asynchronous pipe for reading if set to GNUNET_NO
- * @param blocking_write creates an asynchronous pipe for writing if set to GNUNET_NO
+ * @param pf how to configure the pipe
  * @param fd an array of two fd values. One of them may be -1 for read-only or write-only pipes
  *
  * @return handle to the new pipe, NULL on error
  */
 struct GNUNET_DISK_PipeHandle *
-GNUNET_DISK_pipe_from_fd (int blocking_read, int blocking_write, int fd[2])
+GNUNET_DISK_pipe_from_fd (enum GNUNET_DISK_PipeFlags pf,
+                          int fd[2])
 {
   struct GNUNET_DISK_PipeHandle *p;
-
-  p = GNUNET_new (struct GNUNET_DISK_PipeHandle);
-
-  int ret;
+  int ret = 0;
   int flags;
   int eno = 0; /* make gcc happy */
 
-  ret = 0;
+  p = GNUNET_new (struct GNUNET_DISK_PipeHandle);
   if (fd[0] >= 0)
   {
     p->fd[0] = GNUNET_new (struct GNUNET_DISK_FileHandle);
     p->fd[0]->fd = fd[0];
-    if (! blocking_read)
+    if (0 == (GNUNET_DISK_PF_BLOCKING_READ & pf))
     {
       flags = fcntl (fd[0], F_GETFL);
       flags |= O_NONBLOCK;
@@ -1530,7 +1517,7 @@ GNUNET_DISK_pipe_from_fd (int blocking_read, int blocking_write, int fd[2])
   {
     p->fd[1] = GNUNET_new (struct GNUNET_DISK_FileHandle);
     p->fd[1]->fd = fd[1];
-    if (! blocking_write)
+    if (0 == (GNUNET_DISK_PF_BLOCKING_WRITE & pf))
     {
       flags = fcntl (fd[1], F_GETFL);
       flags |= O_NONBLOCK;
@@ -1556,13 +1543,12 @@ GNUNET_DISK_pipe_from_fd (int blocking_read, int blocking_write, int fd[2])
       GNUNET_break (0 == close (p->fd[0]->fd));
     if (p->fd[1]->fd >= 0)
       GNUNET_break (0 == close (p->fd[1]->fd));
-    GNUNET_free_non_null (p->fd[0]);
-    GNUNET_free_non_null (p->fd[1]);
+    GNUNET_free (p->fd[0]);
+    GNUNET_free (p->fd[1]);
     GNUNET_free (p);
     errno = eno;
     return NULL;
   }
-
   return p;
 }
 
@@ -1572,7 +1558,7 @@ GNUNET_DISK_pipe_from_fd (int blocking_read, int blocking_write, int fd[2])
  *
  * @param p pipe to close
  * @param end which end of the pipe to close
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
  */
 int
 GNUNET_DISK_pipe_close_end (struct GNUNET_DISK_PipeHandle *p,
@@ -1644,7 +1630,7 @@ GNUNET_DISK_pipe_detach_end (struct GNUNET_DISK_PipeHandle *p,
  * Closes an interprocess channel
  *
  * @param p pipe to close
- * @return GNUNET_OK on success, GNUNET_SYSERR otherwise
+ * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise
  */
 int
 GNUNET_DISK_pipe_close (struct GNUNET_DISK_PipeHandle *p)
diff --git a/src/util/dnsparser.c b/src/util/dnsparser.c
index ab687414e..401723106 100644
--- a/src/util/dnsparser.c
+++ b/src/util/dnsparser.c
@@ -109,8 +109,8 @@ GNUNET_DNSPARSER_free_soa (struct GNUNET_DNSPARSER_SoaRecord *soa)
 {
   if (NULL == soa)
     return;
-  GNUNET_free_non_null (soa->mname);
-  GNUNET_free_non_null (soa->rname);
+  GNUNET_free (soa->mname);
+  GNUNET_free (soa->rname);
   GNUNET_free (soa);
 }
 
@@ -125,7 +125,7 @@ GNUNET_DNSPARSER_free_cert (struct GNUNET_DNSPARSER_CertRecord *cert)
 {
   if (NULL == cert)
     return;
-  GNUNET_free_non_null (cert->certificate_data);
+  GNUNET_free (cert->certificate_data);
   GNUNET_free (cert);
 }
 
@@ -140,7 +140,7 @@ GNUNET_DNSPARSER_free_srv (struct GNUNET_DNSPARSER_SrvRecord *srv)
 {
   if (NULL == srv)
     return;
-  GNUNET_free_non_null (srv->target);
+  GNUNET_free (srv->target);
   GNUNET_free (srv);
 }
 
@@ -155,7 +155,7 @@ GNUNET_DNSPARSER_free_mx (struct GNUNET_DNSPARSER_MxRecord *mx)
 {
   if (NULL == mx)
     return;
-  GNUNET_free_non_null (mx->mxhost);
+  GNUNET_free (mx->mxhost);
   GNUNET_free (mx);
 }
 
@@ -168,7 +168,7 @@ GNUNET_DNSPARSER_free_mx (struct GNUNET_DNSPARSER_MxRecord *mx)
 void
 GNUNET_DNSPARSER_free_record (struct GNUNET_DNSPARSER_Record *r)
 {
-  GNUNET_free_non_null (r->name);
+  GNUNET_free (r->name);
   switch (r->type)
   {
   case GNUNET_DNSPARSER_TYPE_MX:
@@ -190,11 +190,11 @@ GNUNET_DNSPARSER_free_record (struct GNUNET_DNSPARSER_Record *r)
   case GNUNET_DNSPARSER_TYPE_NS:
   case GNUNET_DNSPARSER_TYPE_CNAME:
   case GNUNET_DNSPARSER_TYPE_PTR:
-    GNUNET_free_non_null (r->data.hostname);
+    GNUNET_free (r->data.hostname);
     break;
 
   default:
-    GNUNET_free_non_null (r->data.raw.data);
+    GNUNET_free (r->data.raw.data);
     break;
   }
 }
@@ -854,17 +854,17 @@ void
 GNUNET_DNSPARSER_free_packet (struct GNUNET_DNSPARSER_Packet *p)
 {
   for (unsigned int i = 0; i < p->num_queries; i++)
-    GNUNET_free_non_null (p->queries[i].name);
-  GNUNET_free_non_null (p->queries);
+    GNUNET_free (p->queries[i].name);
+  GNUNET_free (p->queries);
   for (unsigned int i = 0; i < p->num_answers; i++)
     GNUNET_DNSPARSER_free_record (&p->answers[i]);
-  GNUNET_free_non_null (p->answers);
+  GNUNET_free (p->answers);
   for (unsigned int i = 0; i < p->num_authority_records; i++)
     GNUNET_DNSPARSER_free_record (&p->authority_records[i]);
-  GNUNET_free_non_null (p->authority_records);
+  GNUNET_free (p->authority_records);
   for (unsigned int i = 0; i < p->num_additional_records; i++)
     GNUNET_DNSPARSER_free_record (&p->additional_records[i]);
-  GNUNET_free_non_null (p->additional_records);
+  GNUNET_free (p->additional_records);
   GNUNET_free (p);
 }
 
diff --git a/src/util/getopt_helpers.c b/src/util/getopt_helpers.c
index a56ef2d96..592875531 100644
--- a/src/util/getopt_helpers.c
+++ b/src/util/getopt_helpers.c
@@ -377,7 +377,7 @@ set_string (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx,
   (void) ctx;
   (void) option;
   GNUNET_assert (NULL != value);
-  GNUNET_free_non_null (*val);
+  GNUNET_free (*val);
   *val = GNUNET_strdup (value);
   return GNUNET_OK;
 }
@@ -458,7 +458,7 @@ set_filename (struct GNUNET_GETOPT_CommandLineProcessorContext *ctx,
   (void) ctx;
   (void) option;
   GNUNET_assert (NULL != value);
-  GNUNET_free_non_null (*val);
+  GNUNET_free (*val);
   *val = GNUNET_STRINGS_filename_expand (value);
   return GNUNET_OK;
 }
diff --git a/src/util/gnunet-config.c b/src/util/gnunet-config.c
index 5883c1497..2b279dda2 100644
--- a/src/util/gnunet-config.c
+++ b/src/util/gnunet-config.c
@@ -258,7 +258,7 @@ run (void *cls,
         GNUNET_CONFIGURATION_write ((NULL == out) ? diff : out, cfgfile))
       global_ret = 2;
   }
-  GNUNET_free_non_null (cfg_fn);
+  GNUNET_free (cfg_fn);
   if (NULL != out)
     GNUNET_CONFIGURATION_destroy (out);
 cleanup:
diff --git a/src/util/gnunet-qr.c b/src/util/gnunet-qr.c
index cd23c3a9c..83b2af2fc 100644
--- a/src/util/gnunet-qr.c
+++ b/src/util/gnunet-qr.c
@@ -31,7 +31,7 @@
 
 #define LOG(fmt, ...)  \
   if (verbose) \
-    printf (fmt, ## __VA_ARGS__)
+  printf (fmt, ## __VA_ARGS__)
 
 /**
  * Video device to capture from. Sane default for GNU/Linux systems.
@@ -161,10 +161,7 @@ gnunet_uri (void *cls,
     return;
   }
   GNUNET_free (subsystem);
-  sigpipe = GNUNET_DISK_pipe (GNUNET_NO,
-                              GNUNET_NO,
-                              GNUNET_NO,
-                              GNUNET_NO);
+  sigpipe = GNUNET_DISK_pipe (GNUNET_DISK_PF_NONE);
   GNUNET_assert (NULL != sigpipe);
   rt = GNUNET_SCHEDULER_add_read_file (
     GNUNET_TIME_UNIT_FOREVER_REL,
@@ -192,8 +189,7 @@ gnunet_uri (void *cls,
     GNUNET_array_append (argv,
                          argc,
                          NULL);
-    p = GNUNET_OS_start_process_vap (GNUNET_NO,
-                                     GNUNET_OS_INHERIT_STD_ALL,
+    p = GNUNET_OS_start_process_vap (GNUNET_OS_INHERIT_STD_ALL,
                                      NULL,
                                      NULL,
                                      NULL,
diff --git a/src/util/gnunet-scrypt.c b/src/util/gnunet-scrypt.c
index 7d13ce469..aa64144a8 100644
--- a/src/util/gnunet-scrypt.c
+++ b/src/util/gnunet-scrypt.c
@@ -323,7 +323,7 @@ main (int argc, char *const *argv)
     ? 0
     : 1;
   GNUNET_free_nz ((void *) argv);
-  GNUNET_free_non_null (pwfn);
+  GNUNET_free (pwfn);
   return ret;
 }
 
diff --git a/src/util/gnunet-service-resolver.c b/src/util/gnunet-service-resolver.c
index 357453da7..5ed70807e 100644
--- a/src/util/gnunet-service-resolver.c
+++ b/src/util/gnunet-service-resolver.c
@@ -217,7 +217,7 @@ free_cache_entry (struct ResolveCache *rc)
     GNUNET_free (pos->record);
     GNUNET_free (pos);
   }
-  GNUNET_free_non_null (rc->hostname);
+  GNUNET_free (rc->hostname);
   GNUNET_CONTAINER_DLL_remove (cache_head, cache_tail, rc);
   cache_size--;
   GNUNET_free (rc);
@@ -241,7 +241,7 @@ free_hosts_entry (struct ResolveCache *rc)
     GNUNET_free (pos->record);
     GNUNET_free (pos);
   }
-  GNUNET_free_non_null (rc->hostname);
+  GNUNET_free (rc->hostname);
   GNUNET_CONTAINER_DLL_remove (hosts_head, hosts_tail, rc);
   cache_size--;
   GNUNET_free (rc);
@@ -267,7 +267,7 @@ free_active_lookup (struct ActiveLookup *al)
     GNUNET_SCHEDULER_cancel (al->timeout_task);
     al->timeout_task = NULL;
   }
-  GNUNET_free_non_null (al->hostname);
+  GNUNET_free (al->hostname);
   GNUNET_free (al);
 }
 
@@ -1094,7 +1094,7 @@ handle_get (void *cls, const struct GNUNET_RESOLVER_GetMessage *msg)
                  client_request_id,
                  client);
   }
-  GNUNET_free_non_null (hostname);
+  GNUNET_free (hostname);
 }
 
 
@@ -1115,7 +1115,7 @@ shutdown_task (void *cls)
   while (NULL != hosts_head)
     free_hosts_entry (hosts_head);
   GNUNET_DNSSTUB_stop (dnsstub_ctx);
-  GNUNET_free_non_null (my_domain);
+  GNUNET_free (my_domain);
 }
 
 
@@ -1296,7 +1296,7 @@ init_cb (void *cls,
                 GNUNET_OK == result ? "success" : "failure");
     GNUNET_free (dns_servers[i]);
   }
-  GNUNET_free_non_null (dns_servers);
+  GNUNET_free (dns_servers);
 }
 
 
diff --git a/src/util/gnunet-uri.c b/src/util/gnunet-uri.c
index 48c46ee49..9443c9120 100644
--- a/src/util/gnunet-uri.c
+++ b/src/util/gnunet-uri.c
@@ -115,8 +115,7 @@ run (void *cls,
     GNUNET_DISK_pipe_handle (sigpipe, GNUNET_DISK_PIPE_END_READ),
     &maint_child_death,
     NULL);
-  p = GNUNET_OS_start_process (GNUNET_NO,
-                               0,
+  p = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_NONE,
                                NULL,
                                NULL,
                                NULL,
@@ -168,7 +167,7 @@ main (int argc, char *const *argv)
 
   if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
     return 2;
-  sigpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, GNUNET_NO, GNUNET_NO);
+  sigpipe = GNUNET_DISK_pipe (GNUNET_DISK_PF_NONE);
   GNUNET_assert (sigpipe != NULL);
   shc_chld =
     GNUNET_SIGNAL_handler_install (GNUNET_SIGCHLD, &sighandler_child_death);
diff --git a/src/util/helper.c b/src/util/helper.c
index 8c8fb7b6a..7360b7d4b 100644
--- a/src/util/helper.c
+++ b/src/util/helper.c
@@ -401,9 +401,9 @@ static void
 start_helper (struct GNUNET_HELPER_Handle *h)
 {
   h->helper_in =
-    GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_YES, GNUNET_NO);
+    GNUNET_DISK_pipe (GNUNET_DISK_PF_BLOCKING_RW);
   h->helper_out =
-    GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_NO, GNUNET_YES);
+    GNUNET_DISK_pipe (GNUNET_DISK_PF_BLOCKING_RW);
   if ((h->helper_in == NULL) || (h->helper_out == NULL))
   {
     /* out of file descriptors? try again later... */
@@ -422,8 +422,10 @@ start_helper (struct GNUNET_HELPER_Handle *h)
     GNUNET_DISK_pipe_handle (h->helper_out, GNUNET_DISK_PIPE_END_READ);
   h->fh_to_helper =
     GNUNET_DISK_pipe_handle (h->helper_in, GNUNET_DISK_PIPE_END_WRITE);
-  h->helper_proc = GNUNET_OS_start_process_vap (h->with_control_pipe,
-                                                GNUNET_OS_INHERIT_STD_ERR,
+  h->helper_proc = GNUNET_OS_start_process_vap (h->with_control_pipe
+                                                ? GNUNET_OS_INHERIT_STD_ERR
+                                                | GNUNET_OS_USE_PIPE_CONTROL
+                                                : GNUNET_OS_INHERIT_STD_ERR,
                                                 h->helper_in,
                                                 h->helper_out,
                                                 NULL,
diff --git a/src/util/mq.c b/src/util/mq.c
index 78dc7dba2..302b310de 100644
--- a/src/util/mq.c
+++ b/src/util/mq.c
@@ -881,7 +881,7 @@ GNUNET_MQ_destroy (struct GNUNET_MQ_Handle *mq)
     GNUNET_CONTAINER_multihashmap32_destroy (mq->assoc_map);
     mq->assoc_map = NULL;
   }
-  GNUNET_free_non_null (mq->handlers);
+  GNUNET_free (mq->handlers);
   GNUNET_free (mq);
 }
 
diff --git a/src/util/network.c b/src/util/network.c
index 223ce2080..b18030fcd 100644
--- a/src/util/network.c
+++ b/src/util/network.c
@@ -621,7 +621,7 @@ GNUNET_NETWORK_socket_close (struct GNUNET_NETWORK_Handle *desc)
 void
 GNUNET_NETWORK_socket_free_memory_only_ (struct GNUNET_NETWORK_Handle *desc)
 {
-  GNUNET_free_non_null (desc->addr);
+  GNUNET_free (desc->addr);
   GNUNET_free (desc);
 }
 
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index 714df6957..34b88d761 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -563,11 +563,11 @@ GNUNET_OS_installation_get_path (enum GNUNET_OS_InstallationPathKind dirkind)
           (GNUNET_YES == GNUNET_DISK_directory_test (tmp, GNUNET_YES)))
       {
         GNUNET_free (execpath);
-        GNUNET_free_non_null (dirname);
+        GNUNET_free (dirname);
         return tmp;
       }
       GNUNET_free (tmp);
-      GNUNET_free_non_null (dirname);
+      GNUNET_free (dirname);
     }
     GNUNET_asprintf (&dirname,
                      DIR_SEPARATOR_STR "%s" DIR_SEPARATOR_STR,
@@ -643,11 +643,11 @@ GNUNET_OS_installation_get_path (enum GNUNET_OS_InstallationPathKind dirkind)
           (GNUNET_YES == GNUNET_DISK_directory_test (tmp, GNUNET_YES)))
       {
         GNUNET_free (execpath);
-        GNUNET_free_non_null (dirname);
+        GNUNET_free (dirname);
         return tmp;
       }
       GNUNET_free (tmp);
-      GNUNET_free_non_null (dirname);
+      GNUNET_free (dirname);
     }
     GNUNET_asprintf (&dirname,
                      DIR_SEPARATOR_STR "%s" DIR_SEPARATOR_STR
diff --git a/src/util/os_priority.c b/src/util/os_priority.c
index 5799d893b..8d045c72b 100644
--- a/src/util/os_priority.c
+++ b/src/util/os_priority.c
@@ -326,7 +326,6 @@ open_dev_null (int target_fd, int flags)
 /**
  * Start a process.
  *
- * @param pipe_control should a pipe be used to send signals to the child?
  * @param std_inheritance a set of GNUNET_OS_INHERIT_STD_* flags controlling which
  *        std handles of the parent are inherited by the child.
  *        pipe_stdin and pipe_stdout take priority over std_inheritance
@@ -341,8 +340,7 @@ open_dev_null (int target_fd, int flags)
  * @return process ID of the new process, -1 on error
  */
 static struct GNUNET_OS_Process *
-start_process (int pipe_control,
-               enum GNUNET_OS_InheritStdioFlags std_inheritance,
+start_process (enum GNUNET_OS_InheritStdioFlags std_inheritance,
                struct GNUNET_DISK_PipeHandle *pipe_stdin,
                struct GNUNET_DISK_PipeHandle *pipe_stdout,
                struct GNUNET_DISK_PipeHandle *pipe_stderr,
@@ -373,12 +371,12 @@ start_process (int pipe_control,
   if (GNUNET_SYSERR ==
       GNUNET_OS_check_helper_binary (filename, GNUNET_NO, NULL))
     return NULL; /* not executable */
-  if (GNUNET_YES == pipe_control)
+  if (0 != (std_inheritance & GNUNET_OS_USE_PIPE_CONTROL))
   {
     struct GNUNET_DISK_PipeHandle *childpipe;
     int dup_childpipe_read_fd = -1;
 
-    childpipe = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, GNUNET_YES, GNUNET_NO);
+    childpipe = GNUNET_DISK_pipe (GNUNET_DISK_PF_NONE);
     if (NULL == childpipe)
       return NULL;
     childpipe_read =
@@ -486,7 +484,7 @@ start_process (int pipe_control,
     gnunet_proc = GNUNET_new (struct GNUNET_OS_Process);
     gnunet_proc->pid = ret;
     gnunet_proc->control_pipe = childpipe_write;
-    if (GNUNET_YES == pipe_control)
+    if (0 != (std_inheritance & GNUNET_OS_USE_PIPE_CONTROL))
     {
       close (childpipe_read_fd);
     }
@@ -594,7 +592,6 @@ start_process (int pipe_control,
 /**
  * Start a process.
  *
- * @param pipe_control should a pipe be used to send signals to the child?
  * @param std_inheritance a set of GNUNET_OS_INHERIT_STD_* flags
  * @param pipe_stdin pipe to use to send input to child process (or NULL)
  * @param pipe_stdout pipe to use to get output from child process (or NULL)
@@ -604,16 +601,14 @@ start_process (int pipe_control,
  * @return pointer to process structure of the new process, NULL on error
  */
 struct GNUNET_OS_Process *
-GNUNET_OS_start_process_vap (int pipe_control,
-                             enum GNUNET_OS_InheritStdioFlags std_inheritance,
+GNUNET_OS_start_process_vap (enum GNUNET_OS_InheritStdioFlags std_inheritance,
                              struct GNUNET_DISK_PipeHandle *pipe_stdin,
                              struct GNUNET_DISK_PipeHandle *pipe_stdout,
                              struct GNUNET_DISK_PipeHandle *pipe_stderr,
                              const char *filename,
                              char *const argv[])
 {
-  return start_process (pipe_control,
-                        std_inheritance,
+  return start_process (std_inheritance,
                         pipe_stdin,
                         pipe_stdout,
                         pipe_stderr,
@@ -626,7 +621,6 @@ GNUNET_OS_start_process_vap (int pipe_control,
 /**
  * Start a process.
  *
- * @param pipe_control should a pipe be used to send signals to the child?
  * @param std_inheritance a set of GNUNET_OS_INHERIT_STD_* flags
  * @param pipe_stdin pipe to use to send input to child process (or NULL)
  * @param pipe_stdout pipe to use to get output from child process (or NULL)
@@ -636,8 +630,7 @@ GNUNET_OS_start_process_vap (int pipe_control,
  * @return pointer to process structure of the new process, NULL on error
  */
 struct GNUNET_OS_Process *
-GNUNET_OS_start_process_va (int pipe_control,
-                            enum GNUNET_OS_InheritStdioFlags std_inheritance,
+GNUNET_OS_start_process_va (enum GNUNET_OS_InheritStdioFlags std_inheritance,
                             struct GNUNET_DISK_PipeHandle *pipe_stdin,
                             struct GNUNET_DISK_PipeHandle *pipe_stdout,
                             struct GNUNET_DISK_PipeHandle *pipe_stderr,
@@ -660,8 +653,7 @@ GNUNET_OS_start_process_va (int pipe_control,
   while (NULL != (argv[argc] = va_arg (ap, char *)))
     argc++;
   va_end (ap);
-  ret = GNUNET_OS_start_process_vap (pipe_control,
-                                     std_inheritance,
+  ret = GNUNET_OS_start_process_vap (std_inheritance,
                                      pipe_stdin,
                                      pipe_stdout,
                                      pipe_stderr,
@@ -675,7 +667,6 @@ GNUNET_OS_start_process_va (int pipe_control,
 /**
  * Start a process.
  *
- * @param pipe_control should a pipe be used to send signals to the child?
  * @param std_inheritance a set of GNUNET_OS_INHERIT_STD_* flags
  * @param pipe_stdin pipe to use to send input to child process (or NULL)
  * @param pipe_stdout pipe to use to get output from child process (or NULL)
@@ -684,8 +675,7 @@ GNUNET_OS_start_process_va (int pipe_control,
  * @return pointer to process structure of the new process, NULL on error
  */
 struct GNUNET_OS_Process *
-GNUNET_OS_start_process (int pipe_control,
-                         enum GNUNET_OS_InheritStdioFlags std_inheritance,
+GNUNET_OS_start_process (enum GNUNET_OS_InheritStdioFlags std_inheritance,
                          struct GNUNET_DISK_PipeHandle *pipe_stdin,
                          struct GNUNET_DISK_PipeHandle *pipe_stdout,
                          struct GNUNET_DISK_PipeHandle *pipe_stderr,
@@ -696,8 +686,7 @@ GNUNET_OS_start_process (int pipe_control,
   va_list ap;
 
   va_start (ap, filename);
-  ret = GNUNET_OS_start_process_va (pipe_control,
-                                    std_inheritance,
+  ret = GNUNET_OS_start_process_va (std_inheritance,
                                     pipe_stdin,
                                     pipe_stdout,
                                     pipe_stderr,
@@ -711,7 +700,6 @@ GNUNET_OS_start_process (int pipe_control,
 /**
  * Start a process.
  *
- * @param pipe_control should a pipe be used to send signals to the child?
  * @param std_inheritance a set of GNUNET_OS_INHERIT_STD_* flags controlling which
  *        std handles of the parent are inherited by the child.
  *        pipe_stdin and pipe_stdout take priority over std_inheritance
@@ -723,14 +711,12 @@ GNUNET_OS_start_process (int pipe_control,
  * @return process ID of the new process, -1 on error
  */
 struct GNUNET_OS_Process *
-GNUNET_OS_start_process_v (int pipe_control,
-                           enum GNUNET_OS_InheritStdioFlags std_inheritance,
+GNUNET_OS_start_process_v (enum GNUNET_OS_InheritStdioFlags std_inheritance,
                            const int *lsocks,
                            const char *filename,
                            char *const argv[])
 {
-  return start_process (pipe_control,
-                        std_inheritance,
+  return start_process (std_inheritance,
                         NULL,
                         NULL,
                         NULL,
@@ -747,7 +733,6 @@ GNUNET_OS_start_process_v (int pipe_control,
  * in the order they appear.  Arguments containing spaces can be used by
  * quoting them with @em ".
  *
- * @param pipe_control should a pipe be used to send signals to the child?
  * @param std_inheritance a set of GNUNET_OS_INHERIT_STD_* flags
  * @param lsocks array of listen sockets to dup systemd-style (or NULL);
  *         must be NULL on platforms where dup is not supported
@@ -759,8 +744,7 @@ GNUNET_OS_start_process_v (int pipe_control,
  * @return pointer to process structure of the new process, NULL on error
  */
 struct GNUNET_OS_Process *
-GNUNET_OS_start_process_s (int pipe_control,
-                           unsigned int std_inheritance,
+GNUNET_OS_start_process_s (enum GNUNET_OS_InheritStdioFlags std_inheritance,
                            const int *lsocks,
                            const char *filename,
                            ...)
@@ -869,8 +853,7 @@ GNUNET_OS_start_process_s (int pipe_control,
     }
   }
   binary_path = argv[0];
-  proc = GNUNET_OS_start_process_v (pipe_control,
-                                    std_inheritance,
+  proc = GNUNET_OS_start_process_v (std_inheritance,
                                     lsocks,
                                     binary_path,
                                     argv);
@@ -1169,13 +1152,18 @@ GNUNET_OS_command_run (GNUNET_OS_LineProcessor proc,
   struct GNUNET_DISK_PipeHandle *opipe;
   va_list ap;
 
-  opipe = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_NO, GNUNET_YES);
+  opipe = GNUNET_DISK_pipe (GNUNET_DISK_PF_BLOCKING_RW);
   if (NULL == opipe)
     return NULL;
   va_start (ap, binary);
   /* redirect stdout, don't inherit stderr/stdin */
   eip =
-    GNUNET_OS_start_process_va (GNUNET_NO, 0, NULL, opipe, NULL, binary, ap);
+    GNUNET_OS_start_process_va (GNUNET_OS_INHERIT_STD_NONE,
+                                NULL,
+                                opipe,
+                                NULL,
+                                binary,
+                                ap);
   va_end (ap);
   if (NULL == eip)
   {
diff --git a/src/util/perf_malloc.c b/src/util/perf_malloc.c
index 6582505c8..1c91402da 100644
--- a/src/util/perf_malloc.c
+++ b/src/util/perf_malloc.c
@@ -56,11 +56,11 @@ perf_realloc ()
     ptr = GNUNET_malloc (i);
     memset (ptr, 1, i);
     ptr = GNUNET_realloc (ptr, i + 5);
-    for (size_t j=0;j<i;j++)
+    for (size_t j = 0; j<i; j++)
       GNUNET_assert (1 == ptr[j]);
     memset (ptr, 6, i + 5);
     ptr = GNUNET_realloc (ptr, i - 5);
-    for (size_t j=0;j<i-5;j++)
+    for (size_t j = 0; j<i - 5; j++)
       GNUNET_assert (6 == ptr[j]);
     GNUNET_free (ptr);
   }
diff --git a/src/util/perf_scheduler.c b/src/util/perf_scheduler.c
index 3ea76e24c..4d4d0a228 100644
--- a/src/util/perf_scheduler.c
+++ b/src/util/perf_scheduler.c
@@ -94,8 +94,8 @@ main (int argc, char *argv[])
             GNUNET_YES));
   GAUGER ("UTIL", "Scheduler",
           tasks / 1024 / (1
-                       + GNUNET_TIME_absolute_get_duration
-                         (start).rel_value_us / 1000LL), "tasks/ms");
+                          + GNUNET_TIME_absolute_get_duration
+                            (start).rel_value_us / 1000LL), "tasks/ms");
   return 0;
 }
 
diff --git a/src/util/program.c b/src/util/program.c
index 5ad069edd..8bda34b4f 100644
--- a/src/util/program.c
+++ b/src/util/program.c
@@ -342,10 +342,10 @@ GNUNET_PROGRAM_run2 (int argc,
   ret = GNUNET_OK;
 cleanup:
   GNUNET_CONFIGURATION_destroy (cfg);
-  GNUNET_free_non_null (cc.cfgfile);
-  GNUNET_free_non_null (cfg_fn);
-  GNUNET_free_non_null (loglev);
-  GNUNET_free_non_null (logfile);
+  GNUNET_free (cc.cfgfile);
+  GNUNET_free (cfg_fn);
+  GNUNET_free (loglev);
+  GNUNET_free (logfile);
   return ret;
 }
 
diff --git a/src/util/regex.c b/src/util/regex.c
index d3ab35652..fed325cd6 100644
--- a/src/util/regex.c
+++ b/src/util/regex.c
@@ -174,10 +174,10 @@ num_to_regex (uint16_t value,
     GNUNET_asprintf (&ret,
                      "%s%s%s%s",
                      a, b, c, d);
-  GNUNET_free_non_null (a);
-  GNUNET_free_non_null (b);
-  GNUNET_free_non_null (c);
-  GNUNET_free_non_null (d);
+  GNUNET_free (a);
+  GNUNET_free (b);
+  GNUNET_free (c);
+  GNUNET_free (d);
   return ret;
 }
 
@@ -607,7 +607,7 @@ address_to_regex (const void *addr,
     reg = num_to_regex (a[i], m[i]);
     if (NULL == reg)
     {
-      GNUNET_free_non_null (ret);
+      GNUNET_free (ret);
       return NULL;
     }
     if (NULL == ret)
@@ -721,7 +721,7 @@ GNUNET_TUN_ipv4policy2regex (const char *policy)
     line = ipv4_to_regex (&np[i]);
     if (NULL == line)
     {
-      GNUNET_free_non_null (reg);
+      GNUNET_free (reg);
       GNUNET_free (np);
       return NULL;
     }
@@ -777,7 +777,7 @@ GNUNET_TUN_ipv6policy2regex (const char *policy)
     line = ipv6_to_regex (&np[i]);
     if (NULL == line)
     {
-      GNUNET_free_non_null (reg);
+      GNUNET_free (reg);
       GNUNET_free (np);
       return NULL;
     }
diff --git a/src/util/scheduler.c b/src/util/scheduler.c
index 93393bd7c..b5ce20254 100644
--- a/src/util/scheduler.c
+++ b/src/util/scheduler.c
@@ -2214,10 +2214,7 @@ GNUNET_SCHEDULER_driver_init (const struct GNUNET_SCHEDULER_Driver *driver)
   GNUNET_assert (NULL == shutdown_pipe_handle);
   /* general set-up */
   sh = GNUNET_new (struct GNUNET_SCHEDULER_Handle);
-  shutdown_pipe_handle = GNUNET_DISK_pipe (GNUNET_NO,
-                                           GNUNET_NO,
-                                           GNUNET_NO,
-                                           GNUNET_NO);
+  shutdown_pipe_handle = GNUNET_DISK_pipe (GNUNET_DISK_PF_NONE);
   GNUNET_assert (NULL != shutdown_pipe_handle);
   pr = GNUNET_DISK_pipe_handle (shutdown_pipe_handle,
                                 GNUNET_DISK_PIPE_END_READ);
diff --git a/src/util/service.c b/src/util/service.c
index ea078b19b..e6bbe855f 100644
--- a/src/util/service.c
+++ b/src/util/service.c
@@ -1144,7 +1144,7 @@ get_server_addresses (const char *service_name,
           (EACCES == errno))
       {
         LOG_STRERROR (GNUNET_ERROR_TYPE_ERROR, "socket");
-        GNUNET_free_non_null (hostname);
+        GNUNET_free (hostname);
         GNUNET_free (unixpath);
         return GNUNET_SYSERR;
       }
@@ -1170,7 +1170,7 @@ get_server_addresses (const char *service_name,
          _ (
            "Have neither PORT nor UNIXPATH for service `%s', but one is required\n"),
          service_name);
-    GNUNET_free_non_null (hostname);
+    GNUNET_free (hostname);
     return GNUNET_SYSERR;
   }
   if (0 == port)
@@ -1178,8 +1178,8 @@ get_server_addresses (const char *service_name,
     saddrs = GNUNET_new_array (2, struct sockaddr *);
     saddrlens = GNUNET_new_array (2, socklen_t);
     add_unixpath (saddrs, saddrlens, unixpath);
-    GNUNET_free_non_null (unixpath);
-    GNUNET_free_non_null (hostname);
+    GNUNET_free (unixpath);
+    GNUNET_free (hostname);
     *addrs = saddrs;
     *addr_lens = saddrlens;
     return 1;
@@ -1203,7 +1203,7 @@ get_server_addresses (const char *service_name,
            hostname,
            gai_strerror (ret));
       GNUNET_free (hostname);
-      GNUNET_free_non_null (unixpath);
+      GNUNET_free (unixpath);
       return GNUNET_SYSERR;
     }
     next = res;
@@ -1223,7 +1223,7 @@ get_server_addresses (const char *service_name,
            hostname);
       freeaddrinfo (res);
       GNUNET_free (hostname);
-      GNUNET_free_non_null (unixpath);
+      GNUNET_free (unixpath);
       return GNUNET_SYSERR;
     }
     resi = i;
@@ -1330,7 +1330,7 @@ get_server_addresses (const char *service_name,
       ((struct sockaddr_in *) saddrs[i])->sin_port = htons (port);
     }
   }
-  GNUNET_free_non_null (unixpath);
+  GNUNET_free (unixpath);
   *addrs = saddrs;
   *addr_lens = saddrlens;
   return resi;
@@ -1557,8 +1557,8 @@ setup_service (struct GNUNET_SERVICE_Handle *sh)
       }
       GNUNET_CONTAINER_DLL_insert (sh->slc_head, sh->slc_tail, slc);
     }
-    GNUNET_free_non_null (addrlens);
-    GNUNET_free_non_null (addrs);
+    GNUNET_free (addrlens);
+    GNUNET_free (addrs);
     if ((0 != num) && (NULL == sh->slc_head))
     {
       /* All attempts to bind failed, hard failure */
@@ -1566,7 +1566,7 @@ setup_service (struct GNUNET_SERVICE_Handle *sh)
         GNUNET_ERROR_TYPE_ERROR,
         _ (
           "Could not bind to any of the ports I was supposed to, refusing to run!\n"));
-      GNUNET_free_non_null (csocks);
+      GNUNET_free (csocks);
       return GNUNET_SYSERR;
     }
   }
@@ -1793,10 +1793,10 @@ teardown_service (struct GNUNET_SERVICE_Handle *sh)
 {
   struct ServiceListenContext *slc;
 
-  GNUNET_free_non_null (sh->v4_denied);
-  GNUNET_free_non_null (sh->v6_denied);
-  GNUNET_free_non_null (sh->v4_allowed);
-  GNUNET_free_non_null (sh->v6_allowed);
+  GNUNET_free (sh->v4_denied);
+  GNUNET_free (sh->v6_denied);
+  GNUNET_free (sh->v4_allowed);
+  GNUNET_free (sh->v6_allowed);
   while (NULL != (slc = sh->slc_head))
   {
     GNUNET_CONTAINER_DLL_remove (sh->slc_head, sh->slc_tail, slc);
@@ -1890,7 +1890,7 @@ GNUNET_SERVICE_start (const char *service_name,
   sh->handlers = GNUNET_MQ_copy_handlers2 (handlers, &return_agpl, NULL);
   if (GNUNET_OK != setup_service (sh))
   {
-    GNUNET_free_non_null (sh->handlers);
+    GNUNET_free (sh->handlers);
     GNUNET_free (sh);
     return NULL;
   }
@@ -1913,7 +1913,7 @@ GNUNET_SERVICE_stop (struct GNUNET_SERVICE_Handle *srv)
   while (NULL != (client = srv->clients_head))
     GNUNET_SERVICE_client_drop (client);
   teardown_service (srv);
-  GNUNET_free_non_null (srv->handlers);
+  GNUNET_free (srv->handlers);
   GNUNET_free (srv);
 }
 
@@ -2021,8 +2021,8 @@ GNUNET_SERVICE_run_ (int argc,
   sh.disconnect_cb = disconnect_cb;
   sh.cb_cls = cls;
   sh.handlers = (NULL == pd->agpl_url)
-    ? GNUNET_MQ_copy_handlers (handlers)
-    : GNUNET_MQ_copy_handlers2 (handlers, &return_agpl, NULL);
+                ? GNUNET_MQ_copy_handlers (handlers)
+                : GNUNET_MQ_copy_handlers2 (handlers, &return_agpl, NULL);
   sh.service_name = service_name;
   sh.ret = 0;
   /* setup subsystems */
@@ -2159,13 +2159,13 @@ shutdown:
   }
 #endif
   teardown_service (&sh);
-  GNUNET_free_non_null (sh.handlers);
+  GNUNET_free (sh.handlers);
   GNUNET_SPEEDUP_stop_ ();
   GNUNET_CONFIGURATION_destroy (cfg);
-  GNUNET_free_non_null (logfile);
-  GNUNET_free_non_null (loglev);
+  GNUNET_free (logfile);
+  GNUNET_free (loglev);
   GNUNET_free (cfg_filename);
-  GNUNET_free_non_null (opt_cfg_filename);
+  GNUNET_free (opt_cfg_filename);
 
   return err ? GNUNET_SYSERR : sh.ret;
 }
diff --git a/src/util/socks.c b/src/util/socks.c
index 756be753a..7ab297272 100644
--- a/src/util/socks.c
+++ b/src/util/socks.c
@@ -665,7 +665,7 @@ GNUNET_SOCKS_do_connect (const char *service_name,
                                                   (host0 != NULL) ? host0
                                                   : "127.0.0.1",
                                                   port0);
-  GNUNET_free_non_null (host0);
+  GNUNET_free (host0);
 
   /* Sets to NULL if they do not exist */
   (void) GNUNET_CONFIGURATION_get_value_string (cfg,
@@ -677,8 +677,8 @@ GNUNET_SOCKS_do_connect (const char *service_name,
                                                 "SOCKSPASS",
                                                 &pass);
   ih = GNUNET_SOCKS_init_handshake (user, pass);
-  GNUNET_free_non_null (user);
-  GNUNET_free_non_null (pass);
+  GNUNET_free (user);
+  GNUNET_free (pass);
 
   GNUNET_SOCKS_set_handshake_destination (ih, host1, port1);
   GNUNET_free (host1);
diff --git a/src/util/strings.c b/src/util/strings.c
index 9510b3b3b..41180dd71 100644
--- a/src/util/strings.c
+++ b/src/util/strings.c
@@ -1148,7 +1148,7 @@ GNUNET_STRINGS_path_is_absolute (const char *filename,
       if (r_uri_scheme)
         *r_uri_scheme = uri;
       else
-        GNUNET_free_non_null (uri);
+        GNUNET_free (uri);
 
       return GNUNET_STRINGS_path_is_absolute (post_scheme_path,
                                               GNUNET_NO,
@@ -1985,7 +1985,7 @@ GNUNET_STRINGS_base64_decode (const char *data, size_t len, void **out)
                 "ignoring CR/LF\n");                              \
     i++;                                                          \
     if (i >= len)                                                 \
-      goto END;                                                   \
+    goto END;                                                   \
   }
 
   GNUNET_assert (len / 3 < SIZE_MAX);
diff --git a/src/util/test_bio.c b/src/util/test_bio.c
index 0c8453121..f18014719 100644
--- a/src/util/test_bio.c
+++ b/src/util/test_bio.c
@@ -52,14 +52,14 @@ test_normal_rw (void)
     GNUNET_BIO_write_spec_string ("test-normal-rw-string", TESTSTRING),
     GNUNET_BIO_write_spec_meta_data ("test-normal-rw-metadata", mdW),
     GNUNET_BIO_write_spec_int64 ("test-normal-rw-int64", &wNum),
-    GNUNET_BIO_write_spec_end(),
+    GNUNET_BIO_write_spec_end (),
   };
 
   struct GNUNET_BIO_ReadSpec rs[] = {
     GNUNET_BIO_read_spec_string ("test-normal-rw-string", &rString, 200),
     GNUNET_BIO_read_spec_meta_data ("test-normal-rw-metadata", &mdR),
     GNUNET_BIO_read_spec_int64 ("test-normal-rw-int64", &rNum),
-    GNUNET_BIO_read_spec_end(),
+    GNUNET_BIO_read_spec_end (),
   };
 
   /* I/O on file */
@@ -73,12 +73,13 @@ test_normal_rw (void)
   GNUNET_assert (GNUNET_OK == GNUNET_BIO_read_spec_commit (rh, rs));
   GNUNET_assert (GNUNET_OK == GNUNET_BIO_read_close (rh, NULL));
   GNUNET_assert (0 == strcmp (TESTSTRING, rString));
-  GNUNET_assert (GNUNET_YES == GNUNET_CONTAINER_meta_data_test_equal (mdR, mdW));
+  GNUNET_assert (GNUNET_YES == GNUNET_CONTAINER_meta_data_test_equal (mdR,
+                                                                      mdW));
   GNUNET_assert (wNum == rNum);
 
   GNUNET_CONTAINER_meta_data_destroy (mdR);
   GNUNET_assert (GNUNET_OK == GNUNET_DISK_directory_remove (filename));
-  GNUNET_free(filename);
+  GNUNET_free (filename);
 
   /* I/O on buffer */
   wh = GNUNET_BIO_write_open_buffer ();
@@ -96,7 +97,8 @@ test_normal_rw (void)
   GNUNET_assert (GNUNET_OK == GNUNET_BIO_read_spec_commit (rh, rs));
   GNUNET_assert (GNUNET_OK == GNUNET_BIO_read_close (rh, NULL));
   GNUNET_assert (0 == strcmp (TESTSTRING, rString));
-  GNUNET_assert (GNUNET_YES == GNUNET_CONTAINER_meta_data_test_equal (mdR, mdW));
+  GNUNET_assert (GNUNET_YES == GNUNET_CONTAINER_meta_data_test_equal (mdR,
+                                                                      mdW));
   GNUNET_assert (wNum == rNum);
 
   GNUNET_free (buffer);
@@ -314,7 +316,7 @@ test_fullfile_rw (void)
                                  200),
     GNUNET_BIO_read_spec_meta_data ("test-fullfile-rw-metadata",
                                     &mdR),
-    GNUNET_BIO_read_spec_end(),
+    GNUNET_BIO_read_spec_end (),
   };
 
   wh = GNUNET_BIO_write_open_file ("/dev/full");
diff --git a/src/util/test_common_allocation.c b/src/util/test_common_allocation.c
index a24af7124..50f259257 100644
--- a/src/util/test_common_allocation.c
+++ b/src/util/test_common_allocation.c
@@ -33,6 +33,7 @@ check (void)
   char *ptrs[MAX_TESTVAL];
   unsigned int **a2;
   char ***a3;
+  char *tmp;
   int i;
   int j;
   int k;
@@ -55,9 +56,9 @@ check (void)
     GNUNET_free (ptrs[i]);
   }
 
-  /* GNUNET_free_non_null test */
-  GNUNET_free_non_null (NULL);
-  GNUNET_free_non_null (GNUNET_malloc (4));
+  /* GNUNET_free test */
+  tmp = GNUNET_malloc (4);
+  GNUNET_free (tmp);
 
   /* GNUNET_strdup tests */
   ptrs[0] = GNUNET_strdup ("bar");
diff --git a/src/util/test_common_logging_runtime_loglevels.c b/src/util/test_common_logging_runtime_loglevels.c
index e6d83d52c..79cf9d53a 100644
--- a/src/util/test_common_logging_runtime_loglevels.c
+++ b/src/util/test_common_logging_runtime_loglevels.c
@@ -207,7 +207,7 @@ read_output_line (int phase_from1, int phase_to1, int phase_from2,
  */
 #define LOG_MAX_LINE_LENGTH (17)
 
-#define LOG_BUFFER_SIZE LOG_MAX_NUM_LINES * LOG_MAX_LINE_LENGTH
+#define LOG_BUFFER_SIZE LOG_MAX_NUM_LINES *LOG_MAX_LINE_LENGTH
 
 static char buf[LOG_BUFFER_SIZE];
 
@@ -347,8 +347,7 @@ runone ()
 {
   const struct GNUNET_DISK_FileHandle *stdout_read_handle;
 
-  pipe_stdout = GNUNET_DISK_pipe (GNUNET_YES, GNUNET_YES, GNUNET_NO,
-                                  GNUNET_YES);
+  pipe_stdout = GNUNET_DISK_pipe (GNUNET_DISK_PF_BLOCKING_RW);
 
   if (pipe_stdout == NULL)
   {
@@ -403,7 +402,7 @@ runone ()
     break;
   }
 
-  proc = GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+  proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
                                   NULL, pipe_stdout, NULL,
                                   "./test_common_logging_dummy",
                                   "test_common_logging_dummy", NULL);
diff --git a/src/util/test_configuration.c b/src/util/test_configuration.c
index 6227a28db..59b1b2291 100644
--- a/src/util/test_configuration.c
+++ b/src/util/test_configuration.c
@@ -128,7 +128,7 @@ diffsCallBack (void *cls, const char *section, const char *option,
       }
       else
         cbData->status = 1;
-      GNUNET_free_non_null (diffValue);
+      GNUNET_free (diffValue);
       break;
     }
 
diff --git a/src/util/test_container_meta_data.c b/src/util/test_container_meta_data.c
index d768f3699..db413f313 100644
--- a/src/util/test_container_meta_data.c
+++ b/src/util/test_container_meta_data.c
@@ -113,7 +113,7 @@ testMeta (int i)
       GNUNET_CONTAINER_meta_data_serialize (m, &sval, size,
                                             GNUNET_CONTAINER_META_DATA_SERIALIZE_FULL))
   {
-    GNUNET_free_non_null (sval);
+    GNUNET_free (sval);
     ABORT (m);
   }
   GNUNET_CONTAINER_meta_data_destroy (m);
diff --git a/src/util/test_container_multihashmap.c b/src/util/test_container_multihashmap.c
index bd9e7af31..f46b9f56e 100644
--- a/src/util/test_container_multihashmap.c
+++ b/src/util/test_container_multihashmap.c
@@ -31,7 +31,7 @@
                   if (m != NULL) GNUNET_CONTAINER_multihashmap_destroy (m); \
                   if (NULL != \
                       iter) \
-                    GNUNET_CONTAINER_multihashmap_iterator_destroy (iter); \
+                  GNUNET_CONTAINER_multihashmap_iterator_destroy (iter); \
                   return 1; }
 #define CHECK(c) { if (! (c)) ABORT (); }
 
diff --git a/src/util/test_container_multipeermap.c b/src/util/test_container_multipeermap.c
index 9aeead56c..cb6fc30d2 100644
--- a/src/util/test_container_multipeermap.c
+++ b/src/util/test_container_multipeermap.c
@@ -31,7 +31,7 @@
                   if (NULL != m) GNUNET_CONTAINER_multipeermap_destroy (m); \
                   if (NULL != \
                       iter) \
-                    GNUNET_CONTAINER_multipeermap_iterator_destroy (iter); \
+                  GNUNET_CONTAINER_multipeermap_iterator_destroy (iter); \
                   return 1; }
 #define CHECK(c) { if (! (c)) ABORT (); }
 
diff --git a/src/util/test_crypto_symmetric.c b/src/util/test_crypto_symmetric.c
index 9f6cd5ed0..5012c7f5b 100644
--- a/src/util/test_crypto_symmetric.c
+++ b/src/util/test_crypto_symmetric.c
@@ -147,7 +147,7 @@ verifyCrypto ()
     ret = 1;
   }
 error:
-  GNUNET_free_non_null (res);
+  GNUNET_free (res);
   return ret;
 }
 
diff --git a/src/util/test_os_start_process.c b/src/util/test_os_start_process.c
index 2bdca5c9d..6d4a131bb 100644
--- a/src/util/test_os_start_process.c
+++ b/src/util/test_os_start_process.c
@@ -138,7 +138,7 @@ run_task (void *cls)
   }
 
   proc =
-    GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_ERR,
+    GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ERR,
                              hello_pipe_stdin, hello_pipe_stdout, NULL,
                              fn,
                              "test_gnunet_echo_hello", "-", NULL);
@@ -212,7 +212,8 @@ check_kill ()
   }
   fn = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver");
   proc =
-    GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ERR,
+    GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ERR
+                             | GNUNET_OS_USE_PIPE_CONTROL,
                              hello_pipe_stdin,
                              hello_pipe_stdout,
                              NULL,
@@ -256,7 +257,8 @@ check_instant_kill ()
   }
   fn = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver");
   proc =
-    GNUNET_OS_start_process (GNUNET_YES, GNUNET_OS_INHERIT_STD_ERR,
+    GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ERR
+                             | GNUNET_OS_USE_PIPE_CONTROL,
                              hello_pipe_stdin, hello_pipe_stdout, NULL,
                              fn,
                              "gnunet-service-resolver", "-", NULL);
diff --git a/src/util/test_resolver_api.c b/src/util/test_resolver_api.c
index 13fda53bf..eefb20890 100644
--- a/src/util/test_resolver_api.c
+++ b/src/util/test_resolver_api.c
@@ -215,7 +215,7 @@ run (void *cls, char *const *args, const char *cfgfile,
   own_fqdn = GNUNET_RESOLVER_local_fqdn_get ();
   /* can't really check, only thing we can safely
      compare against is our own identical logic... */
-  GNUNET_free_non_null (own_fqdn);
+  GNUNET_free (own_fqdn);
 
   /*
    * Testing non-local DNS resolution
@@ -348,8 +348,8 @@ main (int argc, char *argv[])
                     "WARNING",
                     NULL);
   fn = GNUNET_OS_get_libexec_binary_path ("gnunet-service-resolver");
-  proc = GNUNET_OS_start_process (GNUNET_YES,
-                                  GNUNET_OS_INHERIT_STD_OUT_AND_ERR,
+  proc = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_OUT_AND_ERR
+                                  | GNUNET_OS_USE_PIPE_CONTROL,
                                   NULL, NULL, NULL,
                                   fn,
                                   "gnunet-service-resolver",
diff --git a/src/util/test_scheduler.c b/src/util/test_scheduler.c
index 471ca64e5..0e2e7f760 100644
--- a/src/util/test_scheduler.c
+++ b/src/util/test_scheduler.c
@@ -133,7 +133,7 @@ task4 (void *cls)
 
   GNUNET_assert (4 == *ok);
   (*ok) = 6;
-  p = GNUNET_DISK_pipe (GNUNET_NO, GNUNET_NO, GNUNET_NO, GNUNET_NO);
+  p = GNUNET_DISK_pipe (GNUNET_DISK_PF_NONE);
   GNUNET_assert (NULL != p);
   fds[0] = GNUNET_DISK_pipe_handle (p, GNUNET_DISK_PIPE_END_READ);
   fds[1] = GNUNET_DISK_pipe_handle (p, GNUNET_DISK_PIPE_END_WRITE);
diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c
index 62bc45e41..4c57438c3 100644
--- a/src/vpn/gnunet-service-vpn.c
+++ b/src/vpn/gnunet-service-vpn.c
@@ -2882,7 +2882,7 @@ cleanup (void *cls)
     stats = NULL;
   }
   for (i = 0; i < 5; i++)
-    GNUNET_free_non_null (vpn_argv[i]);
+    GNUNET_free (vpn_argv[i]);
 }
 
 
@@ -3008,7 +3008,7 @@ run (void *cls,
                                  _ ("Must specify valid IPv6 address"));
       GNUNET_free (binary);
       GNUNET_SCHEDULER_shutdown ();
-      GNUNET_free_non_null (ipv6addr);
+      GNUNET_free (ipv6addr);
       return;
     }
     vpn_argv[2] = ipv6addr;
@@ -3020,7 +3020,7 @@ run (void *cls,
     {
       GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, "VPN", "IPV6PREFIX");
       GNUNET_SCHEDULER_shutdown ();
-      GNUNET_free_non_null (ipv6prefix_s);
+      GNUNET_free (ipv6prefix_s);
       return;
     }
     vpn_argv[3] = ipv6prefix_s;
@@ -3062,7 +3062,7 @@ run (void *cls,
                                  _ ("Must specify valid IPv4 address"));
       GNUNET_free (binary);
       GNUNET_SCHEDULER_shutdown ();
-      GNUNET_free_non_null (ipv4addr);
+      GNUNET_free (ipv4addr);
       return;
     }
     vpn_argv[4] = ipv4addr;
@@ -3079,7 +3079,7 @@ run (void *cls,
                                  _ ("Must specify valid IPv4 mask"));
       GNUNET_free (binary);
       GNUNET_SCHEDULER_shutdown ();
-      GNUNET_free_non_null (ipv4mask);
+      GNUNET_free (ipv4mask);
       return;
     }
     vpn_argv[5] = ipv4mask;
diff --git a/src/vpn/gnunet-vpn.c b/src/vpn/gnunet-vpn.c
index a7f7fc30c..60d631d5e 100644
--- a/src/vpn/gnunet-vpn.c
+++ b/src/vpn/gnunet-vpn.c
@@ -107,9 +107,9 @@ do_disconnect (void *cls)
     GNUNET_VPN_disconnect (handle);
     handle = NULL;
   }
-  GNUNET_free_non_null (peer_id);
-  GNUNET_free_non_null (service_name);
-  GNUNET_free_non_null (target_ip);
+  GNUNET_free (peer_id);
+  GNUNET_free (service_name);
+  GNUNET_free (target_ip);
 }