[GNUnet-SVN] [gnunet] 61/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 43b34377e10d329075327104e4a295ee9d3c53b4
Merge: b0937948a 9ba4c1d15
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Tue Dec 27 16:43:48 2016 +0100

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

 doc/man/gnunet-nat.1                   |   52 +-
 src/include/gnunet_configuration_lib.h |    2 +-
 src/include/gnunet_nat_service.h       |   10 +-
 src/nat/Makefile.am                    |    1 +
 src/nat/gnunet-nat-server.c            |   44 +-
 src/nat/gnunet-nat.c                   |  108 ++-
 src/nat/gnunet-service-nat.c           | 1570 ++++++++++++++++++++++++--------
 src/nat/gnunet-service-nat_mini.c      |  763 ++++++++++++++++
 src/nat/gnunet-service-nat_mini.h      |  127 +++
 src/nat/nat.h                          |    2 +-
 src/nat/nat_api.c                      |   27 +
 src/nat/nat_api_stun.c                 |    4 +-
 src/nat/nat_stun.h                     |   21 +-
 src/util/util.conf                     |   10 +
 14 files changed, 2308 insertions(+), 433 deletions(-)

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