[tor-commits] [tor/master] Mark cert_matches_key as not-intrusive; fix stretch compilation.