commit 7217bdacb50e6934abdf9bb43b4c9b1073155647 Merge: 4c3b43604 5febea0d5 Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 24 12:57:18 2018 -0400

Merge remote-tracking branch 'tor-github/pr/289'

src/feature/hs_common/shared_random_client.c | 21 +++++++++++++---- src/test/test_shared_random.c | 34 ++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 4 deletions(-)