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