[tor-commits] [tor/master] move a macro; fix a build?