merging origin/git-annex into git-annex

diff --cc 4b1/176/SHA512-s310--910f2cb0a1e665756be0e19cac03288ef2c0bf53c8b3b4e78c76bbf5a8e1a240b0f90d5e397dc1335623b4782beb56a5ab2fb7cbc86aca639e65a81ea1a0a91e.log
index 26f664591e94caf98aa1f108d090dfc05a309f82,2ef4053f1f7d6f2281b09561f2b6e190f3eab264..5a055e9686d1260ad0a04ac4408e520dbf420efb
--- 1/4b1/176/SHA512-s310--910f2cb0a1e665756be0e19cac03288ef2c0bf53c8b3b4e78c76bbf5a8e1a240b0f90d5e397dc1335623b4782beb56a5ab2fb7cbc86aca639e65a81ea1a0a91e.log
--- 2/4b1/176/SHA512-s310--910f2cb0a1e665756be0e19cac03288ef2c0bf53c8b3b4e78c76bbf5a8e1a240b0f90d5e397dc1335623b4782beb56a5ab2fb7cbc86aca639e65a81ea1a0a91e.log
+++ b/4b1/176/SHA512-s310--910f2cb0a1e665756be0e19cac03288ef2c0bf53c8b3b4e78c76bbf5a8e1a240b0f90d5e397dc1335623b4782beb56a5ab2fb7cbc86aca639e65a81ea1a0a91e.log
@@@ -1,2 -1,1 +1,3 @@@
 +1613325525.782165507s 1 32627534-010c-4200-9bba-a800a4a86e52
+ 1613330936.237473576s 1 7867c6bb-feb9-48bc-8112-309cbb59e6fd
 +1613330936.2418261s 1 7867c6bb-feb9-48bc-8112-309cbb59e6fd

diff --cc 865/69c/SHA512-s650123--072fbd99ff994c48b835032105f93010f5860246c8e1576929ff9fa904319dbb627e4d09224dd91924c83b71d2ce75fcf1206f84d73d352fa4b7376238a867c6.log
index ee011f30c80b2eadf9b1da234e75d9c8ad09a511,a640b8e80f45e299d8d2a563ff474e7f432c09be..1f378f5695be2a49c5e64f069957a8a427bb34b4
--- 1/865/69c/SHA512-s650123--072fbd99ff994c48b835032105f93010f5860246c8e1576929ff9fa904319dbb627e4d09224dd91924c83b71d2ce75fcf1206f84d73d352fa4b7376238a867c6.log
--- 2/865/69c/SHA512-s650123--072fbd99ff994c48b835032105f93010f5860246c8e1576929ff9fa904319dbb627e4d09224dd91924c83b71d2ce75fcf1206f84d73d352fa4b7376238a867c6.log
+++ b/865/69c/SHA512-s650123--072fbd99ff994c48b835032105f93010f5860246c8e1576929ff9fa904319dbb627e4d09224dd91924c83b71d2ce75fcf1206f84d73d352fa4b7376238a867c6.log
@@@ -1,2 -1,1 +1,3 @@@
 +1613288206.203435246s 1 32627534-010c-4200-9bba-a800a4a86e52
+ 1613330936.178248537s 1 7867c6bb-feb9-48bc-8112-309cbb59e6fd
 +1613330936.183164221s 1 7867c6bb-feb9-48bc-8112-309cbb59e6fd

diff --cc group.log
index 5f4c01ed1123963a7f42a4d51426c5617191a441,22b792df769a5812a908b001aa694146b3504eca..2c74e21d41d933821af0a95e9e87845d7f1950ef
--- 1/group.log
--- 2/group.log
+++ b/group.log
@@@ -1,2 -1,2 +1,3 @@@
+ 32627534-010c-4200-9bba-a800a4a86e52  timestamp=1593142607.099983663s
 +32627534-010c-4200-9bba-a800a4a86e52  timestamp=1613288137.766650577s
  7867c6bb-feb9-48bc-8112-309cbb59e6fd  timestamp=1593142961.110403348s

diff --cc trust.log
index 5a729e02052de148e933cbec0ee631d8feb8cd37,0c5161443dd910200ccdd06f7e7bd4dbb7a5e9f1..cedace9a903eb6e38112b25b84c317d9e5d316df
--- 1/trust.log
--- 2/trust.log
+++ b/trust.log
@@@ -1,3 -1,3 +1,4 @@@
  00000000-0000-0000-0000-000000000001 0 timestamp=1593132595.494083916s
+ 32627534-010c-4200-9bba-a800a4a86e52 X timestamp=1593142607.098558811s
 +32627534-010c-4200-9bba-a800a4a86e52 X timestamp=1613288137.764795534s
  7867c6bb-feb9-48bc-8112-309cbb59e6fd X timestamp=1593142961.109069138s