[tor-commits] [tor/master] Add a couple of missing renames so the server sandbox works again