[tor-commits] [gettor/master] Apply patch kindly provided by asn for changing naming scheme for