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

Merge branch 'master' into tor

Browse source
This commit is contained in:
Joey Hess 2016-11-29 23:45:25 -04:00
commit b039e5cc35
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Assistant/WebApp/Notifications.hs
View file

@ -16,7 +16,6 @@ import Assistant.DaemonStatus
import Assistant.Types.Buddies import Assistant.Types.Buddies
import Utility.NotificationBroadcaster import Utility.NotificationBroadcaster
import Utility.Yesod import Utility.Yesod
import Utility.WebApp
import Utility.AuthToken import Utility.AuthToken
import Data.Text (Text) import Data.Text (Text)

13
doc/devblog/day_430__tor_socket_problem.mdwn Normal file
View file

@ -0,0 +1,13 @@
Debian's tor daemon is very locked down in the directories it can read
from, and so I've had a hard time finding a place to put the unix socket
file for git-annex's tor hidden service. Painful details in
<http://bugs.debian.org/846275>. At least for now, I'm putting it under
/etc/tor/, which is probably a FHS violation, but seems to be the only
option that doesn't involve a lot of added complexity.
---
The Windows autobuilder is moving, since
[NEST](http://nest-initiative.org/) is shutting down the server it has been
using. Yury Zaytsev has set up a new Windows autobuilder, hosted at
Dartmouth College this time.