/gss_tsig_messages.cc            -diff merge=ours
/gss_tsig_messages.h             -diff merge=ours
