[GNUnet-SVN] [gnunet] 67/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 7122f35e2c00c29b1af31bdd294e93e6fcc84498
Merge: 3c1b722a8 60c6dfd1f
Author: Schanzenbach, Martin <address@hidden>
AuthorDate: Wed Jan 4 12:46:29 2017 +0100

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

 doc/man/gnunet-nat.1                |  10 +-
 src/gns/gnunet-gns-proxy.c          |   3 +-
 src/include/gnunet_nat_service.h    |   9 +-
 src/nat/gnunet-helper-nat-server.c  | 115 +++++++++++++++-----
 src/nat/gnunet-nat.c                |  25 +++--
 src/nat/gnunet-service-nat.c        | 210 +++++++++++++++++++++++++++++-------
 src/nat/gnunet-service-nat_helper.c |  80 +++++++-------
 src/nat/gnunet-service-nat_helper.h |   2 +-
 src/nat/nat.h                       |  24 ++---
 src/nat/nat_api.c                   |  31 +++---
 10 files changed, 347 insertions(+), 162 deletions(-)

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