tree c2c970c089651b35c38f58f18470e652b5ec7a50
parent 4993da924c6f25194aded71e70eefd07208eee81
parent 9ce30624a448f439e19960d0dd88103c04676e7d
author Chad Brubaker <cbrubaker@google.com> 1432934274 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1432934275 +0000

Merge "Add optional additional entropy to finish"