commit 524731503e0a885ab2dbb778831aa79875f8edae Merge: 1a194beb2 3313444ef Author: teor teor@torproject.org Date: Thu Feb 28 10:45:44 2019 +1000

Merge branch 'maint-0.3.3' into maint-0.3.4

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