[tor-commits] [chutney/master] Rename some confusing hs v3 torrc templates