[tor-commits] [tor/master] Move formatting functions around.