commit cc34ba1cecc7733bf69a6fee9e6ecf2ac8661b7e Merge: 2a36541 714aeed Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 5 10:06:16 2016 -0500

Merge branch 'getentropy_028' into maint-0.2.8

changes/bug20865 | 7 +++++++ src/common/crypto.c | 9 +++++++++ 2 files changed, 16 insertions(+)