[tor-commits] [tor/master] Add ifdefs to disable #3332 assertions