[GNUnet-SVN] [gnunet] 51/75: -Merge branch 'master' of ssh://gnunet.org/gnunet into gsoc2018/rest_api

[gnunet]

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

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

commit 688bd873c3cb463090039f64b9f13b9a029695dc
Merge: a006f8260 c9b52f6ce
Author: Phil <address@hidden>
AuthorDate: Wed Jun 13 23:40:25 2018 +0200

    -Merge branch 'master' of ssh://gnunet.org/gnunet into gsoc2018/rest_api

 AUTHORS                                            |    9 +-
 README                                             |  255 +-
 contrib/Makefile.am                                |    2 +-
 contrib/ci/docker/Dockerfile                       |   59 +-
 contrib/scripts/documentation/gnunet-doc.scm       |   66 +-
 contrib/scripts/{report.sh => gnunet-bugreport}    |    2 +-
 contrib/services/openrc/gnunet.initd               |   82 +
 doc/Makefile.am                                    |    3 +-
 doc/documentation/Makefile.am                      |    1 -
 doc/documentation/chapters/developer.texi          |  384 +-
 doc/documentation/chapters/installation.texi       | 4149 --------------------
 doc/documentation/chapters/user.texi               | 1972 +++++++++-
 doc/documentation/gnunet.texi                      |   33 +-
 doc/system_specific/FROM_SOURCE                    | 1423 +++++++
 .../outdated-and-old-installation-instructions.txt |    0
 guix-env.scm                                       |    3 +-
 po/POTFILES.in                                     |    1 -
 src/curl/curl.c                                    |   19 +
 src/datacache/plugin_datacache_heap.c              |    3 +
 src/datacache/plugin_datacache_postgres.c          |   33 +-
 src/datacache/test_datacache.c                     |   73 +-
 src/datacache/test_datacache_quota.c               |   31 +-
 src/dht/gnunet-service-dht_datacache.c             |    5 +
 src/dht/gnunet-service-dht_neighbours.c            |   76 +-
 src/gns/gnunet-service-gns_resolver.c              |   16 +-
 src/gnsrecord/gnsrecord_crypto.c                   |   12 +
 src/include/gnunet_curl_lib.h                      |   11 +
 src/my/my.c                                        |   26 +-
 src/my/my_query_helper.c                           |   22 +-
 src/pq/pq_query_helper.c                           |   58 +-
 src/pq/pq_result_helper.c                          |   85 +-
 src/rps/gnunet-rps-profiler.c                      |   21 +-
 src/rps/rps-test_util.c                            |  133 +-
 src/rps/rps-test_util.h                            |    8 +-
 34 files changed, 4646 insertions(+), 4430 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
address@hidden