[tor-commits] [tor/master] Add some more of our trickier macros to tor-coccinelle.h