[tor-commits] [onionoo/master] Re-apply log config fixes from #13362.