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

doc/bugs/Empty_files_make_git_status_slow.mdwn

@@ -0,0 +1,26 @@
+### Please describe the problem.
+
+When empty files are committed to a repository, git status becomes slow because git annex smudge is run for every empty file under git annex even with clean HEAD. I know git annex is for large files (rather than infinity small ones), but I'm using it to manage a GRASS GIS database, which oddly uses empty files for some things:/
+
+### What steps will reproduce the problem?
+```
+# slow
+touch emptyfile
+git add emptyfile
+git commit -a -m 'Added empty file.'
+GIT_TRACE=1 git status
+
+# fast
+cat 1 > emptyfile
+git commit -a -m 'Added a 1 to emptyfile.'
+GIT_TRACE=1 git status
+```
+
+### What version of git-annex are you using? On what operating system?
+- git-annex version: 6.20170228-g7a32e08c4
+- operating system: linux x86_64 (SLE 12.2)
+- local repository version: 6
+
+
+### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
+Yes, git with git annex has revolutionised my scientific project file organisation and thats why I want to improve it.

doc/todo/wishlist__58___Parity_files_for_encrypted_remotes/comment_1_5fbffd74f9d89857b807093cd7a5941e._comment

@@ -0,0 +1,9 @@
+[[!comment format=mdwn
+ username="git-annex@31849d241f10c295b30a9707352ae5c7d743adb7"
+ nickname="git-annex"
+ avatar="http://cdn.libravatar.org/avatar/180f1a763647bfc099e97ac88b8f7b37"
+ subject="comment 1"
+ date="2017-03-02T16:16:05Z"
+ content="""
+If you're generating parity files for the content anyway, why not encrypt locally, generate parity files for the encrypted content, then check that in to git-annex?
+"""]]