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

doc/bugs/Packfile_does_not_match_digest__58___gcrypt_with_assistant/comment_5_f45d09939527be362c586ae1d470afe4._comment

@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="pot"
+ subject="Same issue"
+ date="2016-07-25T18:23:13Z"
+ content="""
+Anyone got any ideas on how to fix this, or move forward without starting again and trashing the gcrypt repos? Bit of a serious bug this, if it can't be repaired. I was using git-annex for backups, but finding your backups are corrupt would be a bit of a nightmare!
+"""]]

doc/bugs/Packfile_does_not_match_digest__58___gcrypt_with_assistant/comment_6_88178fa312f351a7667b3b2c48335b02._comment

@@ -0,0 +1,7 @@
+[[!comment format=mdwn
+ username="jgoerzen"
+ subject="comment 6"
+ date="2016-07-25T19:09:09Z"
+ content="""
+This was concerning enough to me that I wound up switching to Syncthing for this particular use case.
+"""]]

doc/bugs/gcrypt__58___WARNING__58___Remote_ID_has_changed__33__.mdwn

@@ -0,0 +1,45 @@
+### Please describe the problem.
+
+For some reason, after a while I can't sync to any remotes (removeable drives, servers, etc.)
+
+
+### What steps will reproduce the problem?
+
+git annex sync, git annex assistant doing its autosync, etc.
+
+
+### What version of git-annex are you using? On what operating system?
+
+Arch Linux, git annex 6.20160613-g1e4e6f4
+
+
+### Please provide any additional information below.
+
+[[!format sh """
+# If you can, paste a complete transcript of the problem occurring here.
+
+Typing git annex synx in a terminal gives me:
+
+commit  ok
+pull disk0_annexes_docs 
+gcrypt: Decrypting manifest
+gpg: Signature made Mon 25 Jul 2016 00:13:00 BST using RSA key ID XXXXXXXXXXXXXXX
+gpg: Good signature from "XXX <XXX@XXX.XXX>" [ultimate]
+gcrypt: WARNING:
+gcrypt: WARNING: Remote ID has changed!
+gcrypt: WARNING: from :id:lczpGq00kb1sF+cxgCNE
+gcrypt: WARNING: to   :id:2br4BOnJZkrGUsXTlQR8
+
+
+# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
+
+Not specific to assistant.
+
+
+# End of transcript or log.
+"""]]
+
+
+### 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, this worked for ages, a year or more, it's awesome! Haven't plugged the removeable drives in for a while, now when I do this happens...

doc/design/assistant/telehash.mdwn

@@ -2,7 +2,7 @@
 git-annex (assistant) repositories.
 
 Or something similar like [Snow](http://www.trustiosity.com/snow/)
-or [cjdns](https://github.com/cjdelisle/cjdns) or tor or i2p.
+or [cjdns](https://github.com/cjdelisle/cjdns) or tor or i2p or [magic wormhole](http://magic-wormhole.io/).
 
 ## telehash implementation status
 
@@ -29,6 +29,8 @@ or [cjdns](https://github.com/cjdelisle/cjdns) or tor or i2p.
   and the reliabilty of that network is not known. I notice it has only 1
   pre-seeded peer in the source tree for the DHT, and that peer was not up
   when I tried it.
+* Only provides network-layer transport, still need to implement some 
+  file transfer protocol on top.
 
 ## cjdns status
 
@@ -50,6 +52,14 @@ or [cjdns](https://github.com/cjdelisle/cjdns) or tor or i2p.
 
 ## i2p status
 
+## magic wormhole
+
+* simple file transfer protocol with out of band shared secret
+* handles NAT transversal
+* easy to use
+* doesn't require a running daemon
+* can transfer arbitrary blobs (strings, directories, files)
+
 ## implementation basics
 
 * Add a telehash.log that maps between uuid and telehash address.