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

[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 73a127e962c5ecbfc002b1b0c9ea9cf441591c6d
Merge: 7a6a665ce a1e76003c
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Fri Dec 16 23:59:26 2016 +0100

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

 configure.ac                          |   1 +
 doc/man/gnunet-nat.1                  |   2 +-
 src/conversation/conversation.conf.in |   2 +-
 src/include/gnunet_nat_service.h      |  10 +-
 src/nat/Makefile.am                   |   2 +-
 src/nat/gnunet-nat.c                  |  75 ++++-----
 src/nat/gnunet-service-nat.c          | 276 ++++++++++++++++++++--------------
 src/nat/gnunet-service-nat_helper.c   |  40 +++--
 src/nat/gnunet-service-nat_helper.h   |   8 +-
 src/nat/{nat.conf => nat.conf.in}     |  10 ++
 src/nat/nat_api.c                     |   3 +-
 src/rps/rps.conf.in                   |   2 +-
 12 files changed, 261 insertions(+), 170 deletions(-)


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