commit 3313444ef08b891d344b1965a7776260c02f27ab Merge: 6c966b894 4d9eb4dd0 Author: teor teor@torproject.org Date: Thu Feb 28 10:45:30 2019 +1000

Merge branch 'maint-0.2.9' into maint-0.3.3

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