[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug12169_relay_check'