Merge remote-tracking branch 'origin/master' into identity_oidc
[oweals/gnunet.git] / src / nat / gnunet-service-nat.h
2017-01-20 Schanzenbach, Martin- merge; service API change
2017-01-05 Christian Grothoffmove external IP logic to separate file