[gnunet] 07/07: Merge branch 'master' of ssh://git.gnunet.org/gnunet

[gnunet]

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

t3sserakt pushed a commit to branch master
in repository gnunet.

commit de50c9a2d090008afe835b09e5697ec07e08e51c
Merge: 9d6ace0b9 6b56928ab
Author: t3sserakt <t3ss@posteo.de>
AuthorDate: Wed Jan 18 10:07:43 2023 +0100

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

 .gitignore                          |    2 +
 ChangeLog                           | 2318 -----------------------------------
 NEWS                                |    3 +-
 bin/pogen.sh                        |    2 +
 bootstrap                           |   11 +-
 contrib/conf/commit-msg             |   34 +
 contrib/conf/prepare-commit-msg     |   39 +
 contrib/gana                        |    2 +-
 contrib/get_version.sh              |    2 +-
 contrib/scripts/changelog_delta.sh  |   18 -
 contrib/scripts/news_delta.sh       |    6 +
 contrib/scripts/update_changelog.sh |   10 -
 contrib/scripts/update_news.sh      |   15 +
 contrib/sphinx                      |    2 +-
 debian/changelog                    |   16 +-
 debian/gnunet.install               |    1 +
 gnunet_private_config.h.in          |  741 -----------
 src/include/gnunet_common.h         |    2 +-
 src/include/gnunet_mysql_compat.h   |    8 +-
 src/pq/pq.h                         |    5 +
 src/pq/pq_event.c                   |   10 +-
 src/rest/gnunet-rest-server.c       |    4 +-
 src/testing/testing_api_loop.c      |   47 +-
 src/util/bio.c                      |   47 +-
 src/util/test_bio.c                 |  199 +--
 25 files changed, 322 insertions(+), 3222 deletions(-)

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