commit 9d848ca58a4624df7abae298d8977ae82bcfb543 Merge: 7d767706e 023f62bda Author: Nick Mathewson nickm@torproject.org Date: Tue Nov 7 09:58:42 2017 -0500

Merge remote-tracking branch 'asn/ticket23623_032_01' into 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(-)