[GNUnet-SVN] [gnunet] 07/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 540d02ea89df5e41cf81776c18440c67a0a494b8
Merge: 7356e4ff0 1583915a0
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Thu Dec 1 17:05:29 2016 +0100

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

 configure.ac                        |   2 +-
 doc/man/gnunet-nat.1                |   7 +-
 guix-env.scm                        |   6 +-
 src/gns/gnunet-dns2gns.c            |  11 +-
 src/include/gnunet_nat_service.h    | 127 +++++--
 src/include/gnunet_network_lib.h    |   2 +-
 src/include/gnunet_protocols.h      |  10 -
 src/nat/Makefile.am                 |   9 +-
 src/nat/gnunet-nat.c                | 117 ++++++-
 src/nat/gnunet-service-nat.c        | 509 +++++++++++++++++++++++++---
 src/nat/gnunet-service-nat_helper.c | 410 +++++++++++++++++++++++
 src/nat/gnunet-service-nat_helper.h |  89 +++++
 src/nat/gnunet-service-nat_stun.c   | 211 ++++++++++++
 src/nat/gnunet-service-nat_stun.h   |  61 ++++
 src/nat/nat.conf                    |   3 +
 src/nat/nat.h                       |  55 ---
 src/nat/nat_api.c                   | 152 +--------
 src/nat/nat_api_stun.c              | 262 +++++++++++++++
 src/nat/nat_api_test.c              | 644 ++++++++++++++++++++++++++++++++++++
 src/nat/nat_stun.c                  | 126 -------
 src/nat/nat_stun.h                  | 170 +++++++++-
 src/util/network.c                  |   8 +-
 22 files changed, 2545 insertions(+), 446 deletions(-)


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