commit d8bd98b2fde088d7e277854ceeb69e0a2ba080de Merge: 70553a913 6246f4539 Author: George Kadianakis desnacked@riseup.net Date: Wed May 29 21:28:04 2019 +0300

Merge branch 'tor-github/pr/1032'

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(-)