commit aed893798f5cd9a08ac0440a8970d33ce133d068 Merge: 0fced1949 560ba98dd Author: Nick Mathewson nickm@torproject.org Date: Fri Mar 15 08:54:39 2019 -0400

Merge branch 'maint-0.4.0' into release-0.4.0

src/test/test_shared_random.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)