commit cf92c096ad4338717a11aab71fd020d0514004e5 Merge: 15e28af2d 875117668 Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 2 13:33:37 2019 -0400

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

changes/ticket30921 | 5 +++ src/feature/hs/hs_cache.c | 5 +++ src/test/test_hs_client.c | 89 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 99 insertions(+)