[tor-commits] [ooni-probe/master] factor out another level of if/elses