[gnunet] 12/16: Merge branch 'master' of git+ssh://git.gnunet.org/gnunet

[gnunet]

This is an automated email from the git hooks/post-receive script.

thejackimonster pushed a commit to branch master
in repository gnunet.

commit 21e886defaad18fd48cb488588035d0e337d55c8
Merge: 24d8955b8 33293fd7c
Author: TheJackiMonster <thejackimonster@gmail.com>
AuthorDate: Sat Dec 16 18:55:07 2023 +0100

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

 contrib/Makefile.am                              |    1 -
 contrib/apparmor/gnunet-namestore-fcfsd          |   13 -
 contrib/apparmor/gnunet-service-arm              |    2 -
 contrib/gana                                     |    2 +-
 contrib/handbook                                 |    2 +-
 data/Makefile.am                                 |    3 -
 data/fcfsd/fcfsd-forbidden.html                  |   11 -
 data/fcfsd/fcfsd-index.html                      |  345 -------
 data/fcfsd/fcfsd-notfound.html                   |   11 -
 data/meson.build                                 |    3 -
 debian/changelog                                 |   12 +
 doc/man/Makefile.am                              |    1 -
 doc/man/gnunet-dns2gns.1                         |    1 -
 doc/man/gnunet-namestore-fcfsd.1                 |  103 --
 doc/man/meson.build                              |    1 -
 po/POTFILES.in                                   |    1 -
 src/cli/gns/test_gns_box_sbox.sh                 |   59 ++
 src/cli/gns/test_gns_lightest.sh                 |   14 +-
 src/cli/gns/test_gns_sbox.sh                     |  121 +++
 src/cli/gns/test_gns_sbox_simple.sh              |   39 +
 src/include/gnu_name_system_record_types.h       |    6 +
 src/include/gnunet_gnsrecord_lib.h               |   41 +-
 src/include/gnunet_time_lib.h                    |   11 +
 src/lib/util/gnunet_error_codes.c                |    1 -
 src/lib/util/time.c                              |    6 +-
 src/plugin/gns/plugin_gnsrecord_gns.c            |   85 ++
 src/service/gns/gnunet-service-gns_resolver.c    |  115 ++-
 src/service/namestore/Makefile.am                |   16 -
 src/service/namestore/gnunet-namestore-fcfsd.c   | 1160 ----------------------
 src/service/namestore/meson.build                |   15 -
 src/service/namestore/namestore.conf.in          |   11 -
 src/service/transport/gnunet-service-transport.c |   33 +-
 32 files changed, 500 insertions(+), 1745 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.