commit 1e154d7a156de68f41a52c067ba47fd38ce2a520 Merge: 547ee1c34 d7a5fdcb7 Author: teor teor@torproject.org Date: Wed Mar 20 09:47:59 2019 +1000

Merge branch 'maint-0.3.4' into release-0.3.4

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