commit b77dd67097d300496fc5ced4192835e61107d4ad Merge: 7b9eb0a13 41cd05562 Author: teor teor@torproject.org Date: Wed Mar 20 09:48:08 2019 +1000

Merge branch 'maint-0.3.5' into release-0.3.5

changes/bug28656 | 3 +++ changes/bug29706_minimal | 4 ++++ src/feature/dirauth/shared_random_state.c | 4 ++-- src/feature/dirauth/shared_random_state.h | 2 ++ src/feature/nodelist/nodelist.c | 16 +++++++++++----- src/test/test_shared_random.c | 17 ++++++++++++++--- 6 files changed, 36 insertions(+), 10 deletions(-)