include tor-annex in hidden service directory names

To make it easier to manage/delete them etc.

Backwards compatablity is preserved for existing tor configs.

RemoteDaemon/Transport/Tor.hs

@@ -41,7 +41,7 @@ server th@(TransportHandle (LocalRepo r) _) = do
 	u <- liftAnnex th getUUID
 	uid <- getRealUserID
 	let ident = fromUUID u
-	go u =<< getHiddenServiceSocketFile uid ident
+	go u =<< getHiddenServiceSocketFile torAppName uid ident
   where
 	go u (Just sock) = do
 		q <- newTBMQueueIO maxConnections