another merge from master
authorMichael Rash <mbr@cipherdyne.org>
Tue, 4 Sep 2012 02:32:44 +0000 (22:32 -0400)
committerMichael Rash <mbr@cipherdyne.org>
Tue, 4 Sep 2012 02:32:44 +0000 (22:32 -0400)
commit55fa4841f24f13c1db84fa76a02d106298c057ec
treec2be677ee447d740a6b57ae86c6cf587746ff824
parent5daaca01ea30bec306cdd96085e4efc8e384d082
parent40ac28df21fab384f1389607eed78f6d35159206
another merge from master
client/config_init.c
client/fwknop.c
client/utils.c
configure.ac
lib/fko.h
lib/fko_message.h
server/access.c
server/utils.c
test/test-fwknop.pl