[tor-commits] [tor/master] Clean up a needlessly complex get_datadir_fname use