mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

cleanup

Browse source
This commit is contained in:
Joey Hess 2016-11-29 17:52:46 -04:00
parent f86a7f673c
commit 53bf5cf8e6
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Utility/Tor.hs
View file

@ -29,7 +29,6 @@ type UniqueIdent = String
connectHiddenService :: OnionAddress -> OnionPort -> IO Socket connectHiddenService :: OnionAddress -> OnionPort -> IO Socket
connectHiddenService (OnionAddress address) port = do connectHiddenService (OnionAddress address) port = do
hPutStrLn stderr $ show ("connect to", address, port)
(s, _) <- socksConnect torsockconf socksaddr (s, _) <- socksConnect torsockconf socksaddr
return s return s
where where
@ -122,7 +121,7 @@ hiddenServiceHostnameFile uid ident = hiddenServiceDir uid ident </> "hostname"
-- That should not be a problem if the UniqueIdent is around the length of -- That should not be a problem if the UniqueIdent is around the length of
-- a UUID. -- a UUID.
hiddenServiceSocketFile :: UserID -> UniqueIdent -> FilePath hiddenServiceSocketFile :: UserID -> UniqueIdent -> FilePath
hiddenServiceSocketFile uid ident = etcDir </> "hidden_services" </> show uid ++ "_" ++ show ident </> "s" hiddenServiceSocketFile uid ident = etcDir </> "hidden_services" </> show uid ++ "_" ++ ident </> "s"
-- | Sets up the directory for the socketFile, with appropriate -- | Sets up the directory for the socketFile, with appropriate
-- permissions. Must run as root. -- permissions. Must run as root.