Merge branch 'master' into tlv-mic

diff --combined moonshot/mech_eap/mech_eap.exports
index 3ba5892,1613713..767caeb
--- 1/moonshot/mech_eap/mech_eap.exports
--- 2/moonshot/mech_eap/mech_eap.exports
+++ b/moonshot/mech_eap/mech_eap.exports
@@@ -2,7 -2,6 +2,7 @@@ gss_accept_sec_contex
  gss_acquire_cred
  gss_add_cred
  gss_add_cred_with_password
 +gss_authorize_localname
  gss_canonicalize_name
  gss_compare_name
  gss_context_time
@@@ -51,4 -50,5 +51,5 @@@ GSS_EAP_AES128_CTS_HMAC_SHA1_96_MECHANI
  GSS_EAP_AES256_CTS_HMAC_SHA1_96_MECHANISM
  GSS_EAP_NT_EAP_NAME
  gssspi_acquire_cred_with_password
+ gssspi_authorize_localname
  gssspi_set_cred_option