commit de0969ef7816d54acdcc9f1e2960d8bbc4400ecf Merge: be29dfedd 6a61a020e Author: teor teor@torproject.org Date: Thu Feb 28 10:49:33 2019 +1000

Merge branch 'maint-0.3.4' into maint-0.3.5

src/test/test_shared_random.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)