commit 7232f04939f44146254c21086178c62cce1d3392 Merge: a7cbbf279 ce3d50104 Author: Nick Mathewson nickm@torproject.org Date: Thu Jan 3 21:33:40 2019 -0500

Merge branch 'ticket28880'

src/test/test_config.c | 2 ++ src/test/test_hs_service.c | 7 +++++-- src/test/test_shared_random.c | 1 + 3 files changed, 8 insertions(+), 2 deletions(-)