[GNUnet-SVN] [gnunet] 165/171: Merge remote-tracking branch 'origin/master' into identity_abe

[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 4b8c0ca31b0c8ef09f0a1349f06d37bf9b54fd79
Merge: 9e486ede0 311658e2b
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Wed Dec 20 10:05:45 2017 +0100

    Merge remote-tracking branch 'origin/master' into identity_abe

 AUTHORS                                            |  1 +
 doc/documentation/Makefile.am                      | 24 ++++----
 doc/documentation/README.txt                       |  5 ++
 doc/documentation/chapters/installation.texi       | 65 +++++++++++++++++-----
 src/cadet/gnunet-service-cadet_peer.c              | 51 +++++++++++------
 src/peerinfo/gnunet-service-peerinfo.c             |  6 +-
 src/transport/gnunet-service-transport_ats.c       | 10 +---
 .../gnunet-service-transport_neighbours.c          |  5 +-
 8 files changed, 115 insertions(+), 52 deletions(-)

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