[tor-commits] [tor/master] Replace magic constants for wide_circ_ids with inline function calls