commit 1c9b6292840dd5517578f398d517befbc99bd025 Merge: 733afb52a 9c9214f2c Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 12 11:03:47 2019 -0400

Merge branch 'maint-0.4.0'

changes/bug29706_minimal | 4 + changes/bug29706_refactor | 4 + src/feature/dirauth/shared_random.c | 8 +- src/feature/dirauth/shared_random.h | 2 +- src/feature/dirauth/shared_random_state.c | 60 ++++++-- src/feature/dirauth/shared_random_state.h | 2 + src/test/test_shared_random.c | 245 +++++++++++++++++++++++++++--- 7 files changed, 290 insertions(+), 35 deletions(-)