[tor-commits] [tor/master] Const-ify a few functions