[tor-dev] Commit broken code to otherwsie working master