commit dd62cb788ea0e526cbed835c6c8b5eb15ed8685b Merge: 8dfc8d706 d8bd98b2f Author: George Kadianakis desnacked@riseup.net Date: Thu May 30 21:01:59 2019 +0300

Merge branch 'tor-github/pr/1059'

changes/ticket30150 | 4 ++++ src/test/rng_test_helpers.c | 1 + src/test/test_channel.c | 5 ++++- src/test/test_hs_common.c | 4 ++++ src/test/test_hs_service.c | 48 +++++++++++++++++++++++++++++++++++++++------ 5 files changed, 55 insertions(+), 7 deletions(-)