summaryrefslogtreecommitdiff
path: root/doc/todo
diff options
context:
space:
mode:
authorJoey Hess2016-07-29 10:53:54 -0400
committerJoey Hess2016-07-29 10:53:54 -0400
commit05d78c2591640fabdf1686054c32a6d059f6a081 (patch)
tree6e7e26a757fcd416fa2d6ebfed9b628b365bf747 /doc/todo
parentb013d44f1127ec4e07ed2e5751b448a1cf437d39 (diff)
final merge done
Diffstat (limited to 'doc/todo')
-rw-r--r--doc/todo/merge_request:_make_Sbuild.keypairInsecurelyGenerated_more_robust.mdwn2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/todo/merge_request:_make_Sbuild.keypairInsecurelyGenerated_more_robust.mdwn b/doc/todo/merge_request:_make_Sbuild.keypairInsecurelyGenerated_more_robust.mdwn
index e67cf17e..ed8761c6 100644
--- a/doc/todo/merge_request:_make_Sbuild.keypairInsecurelyGenerated_more_robust.mdwn
+++ b/doc/todo/merge_request:_make_Sbuild.keypairInsecurelyGenerated_more_robust.mdwn
@@ -3,3 +3,5 @@ Please consider merging branch `rngd-robust` of repo `https://git.spwhitton.name
Several changes to the `Sbuild.keypairInsecurelyGenerated` property to make it more robust. Please see comments added by the diff.
> <s>done</s> ... however, that sleep 10 after killing rngd seems quite dodgy. --[[Joey]]
+
+>> final merge [[done]] --[[Joey]]