[tor-commits] [tor/master] Use variables instead of substitutions