commit be29dfedd99f49b8bf22422eff04986f12580733 Merge: 15dc33849 524731503 Author: teor teor@torproject.org Date: Thu Feb 28 10:45:59 2019 +1000

Merge branch 'maint-0.3.4' into maint-0.3.5

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