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.

Command/EnableTor.hs

@@ -56,6 +56,6 @@ start os = do
   where
 	go uuid userid = do
 		(onionaddr, onionport) <- liftIO $
-			addHiddenService "tor-annex" userid (fromUUID uuid)
+			addHiddenService torAppName userid (fromUUID uuid)
 		storeP2PAddress $ TorAnnex onionaddr onionport
 		stop