Merge branch 'master' into 3.0_devel

Conflicts: client/config_init.c client/fwknop.c lib/fko_decode.c lib/fko_rand_value.c server/incoming_spa.c test/test-fwknop.pl

Merge branch 'master' into 3.0_devel
Conflicts: client/config_init.c client/fwknop.c lib/fko_decode.c lib/fko_rand_value.c server/incoming_spa.c test/test-fwknop.pl
45e7e9f6 · Michael Rash · 0ccbade7 · 492a7e52 · 45e7e9f6 · 45e7e9f6
--- a/lib/fko_limits.h
+++ b/lib/fko_limits.h
--- a/lib/fko_message.c
+++ b/lib/fko_message.c
--- a/lib/fko_nat_access.c
+++ b/lib/fko_nat_access.c
--- a/lib/fko_rand_value.c
+++ b/lib/fko_rand_value.c
--- a/lib/fko_server_auth.c
+++ b/lib/fko_server_auth.c
--- a/lib/fko_timestamp.c
+++ b/lib/fko_timestamp.c
--- a/lib/fko_user.c
+++ b/lib/fko_user.c
--- a/lib/fko_util.c
+++ b/lib/fko_util.c
--- a/lib/sha2.c
+++ b/lib/sha2.c
--- a/lib/sha2.h
+++ b/lib/sha2.h
--- a/python/fko.py
+++ b/python/fko.py
--- a/python/fkomodule.c
+++ b/python/fkomodule.c
--- a/server/Makefile.am
+++ b/server/Makefile.am
--- a/server/access.c
+++ b/server/access.c
--- a/server/access.h
+++ b/server/access.h
--- a/server/cmd_opts.h
+++ b/server/cmd_opts.h
--- a/server/config_init.c
+++ b/server/config_init.c
--- a/server/extcmd.c
+++ b/server/extcmd.c
--- a/server/extcmd.h
+++ b/server/extcmd.h
--- a/server/fw_util.h
+++ b/server/fw_util.h