[tor-commits] [chutney/master] Merge remote-tracking branch 'asn-d6/bug33842'