Merge branch 'master' into debian
authorDan Breslau <dbreslau@painless-security.com>
Mon, 31 Jul 2017 16:37:46 +0000 (12:37 -0400)
committerDan Breslau <dbreslau@painless-security.com>
Mon, 31 Jul 2017 16:37:46 +0000 (12:37 -0400)
1  2 
mech_eap/init_sec_context.c

Simple merge