commit 1a97379e5e5d349b4debd5ac61bedcca623dd386 Merge: 11a91ef72 d18a167ff Author: Nick Mathewson nickm@torproject.org Date: Sat Dec 1 11:26:52 2018 -0500

Merge remote-tracking branch 'tor-github/pr/554' into maint-0.3.5

changes/ticket19566 | 6 ++++++ src/feature/dirauth/shared_random.c | 3 ++- src/feature/dirauth/shared_random_state.c | 18 ++++++++++++------ 3 files changed, 20 insertions(+), 7 deletions(-)