[tor-commits] [tor/master] simplify functions now that they don't use options param