Merge branch 'master' of ssh://git-annex.branchable.com

This commit is contained in:
Joey Hess 2019-06-17 15:26:57 -04:00
commit e19408ed9d
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38

View file

@ -0,0 +1,5 @@
The current Hackage version (7.20190615) only compiles with the constraints socks<0.6, persistent-template<2.7.
The compiler errors can be fixed with the attached patches.
In the case of the socks changes (for Tor), I am not sure if it will actually work correctly.