commit 3d1ff4732891535372e92c0d5bc1ae7b7b9a1405 Merge: 6dd377dd6 db2ac3b9f Author: teor teor@torproject.org Date: Wed Mar 20 09:47:51 2019 +1000

Merge branch 'maint-0.2.9' into release-0.2.9

changes/bug29706_minimal | 4 ++++ src/or/shared_random_state.c | 4 ++-- src/or/shared_random_state.h | 2 ++ src/test/test_shared_random.c | 17 ++++++++++++++--- 4 files changed, 22 insertions(+), 5 deletions(-)