[tor-commits] [tor/master] consdiff disable a macro when running with COCCI