commit c6c4a421fd7d8a0d4baba8f34276acaa245548f1 Merge: 0227aab1b 9d848ca58 Author: Nick Mathewson nickm@torproject.org Date: Tue Nov 7 09:58:53 2017 -0500

Merge branch 'maint-0.3.2'

changes/bug23623 | 4 ++ src/or/dirvote.c | 68 ++++++++----------- src/or/dirvote.h | 7 +- src/or/shared_random.c | 8 +-- src/or/shared_random_state.c | 17 ++--- src/or/shared_random_state.h | 2 +- src/test/test_dir.c | 1 + src/test/test_hs_common.c | 21 +++++- src/test/test_hs_service.c | 4 ++ src/test/test_shared_random.c | 149 +++++++++++++++++------------------------- 10 files changed, 126 insertions(+), 155 deletions(-)