Merge branch 'master' into proxy
This commit is contained in:
commit
649b87bedd
16 changed files with 159 additions and 58 deletions
|
@ -58,7 +58,7 @@ connectService address port service = do
|
|||
<$> loadP2PRemoteAuthToken (TorAnnex address port)
|
||||
myuuid <- getUUID
|
||||
g <- Annex.gitRepo
|
||||
conn <- liftIO $ connectPeer g (TorAnnex address port)
|
||||
conn <- liftIO $ connectPeer (Just g) (TorAnnex address port)
|
||||
runst <- liftIO $ mkRunState Client
|
||||
r <- liftIO $ runNetProto runst conn $ auth myuuid authtoken noop >>= \case
|
||||
Just _theiruuid -> connect service stdin stdout
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue