commit c725f598c4ae3e0500110c39c0b5d5165b22195a Merge: 60c2e4b85 be29dfedd Author: teor teor@torproject.org Date: Thu Feb 28 10:46:07 2019 +1000

Merge branch 'maint-0.3.5' into release-0.3.5

changes/bug29599 | 3 +++ src/test/test_shared_random.c | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-)