[tor-commits] [tor/release-0.2.4] Partially revert "Clarify who learns about ContactInfo."