commit 589b60d9e071cbf27e8a45daccf926c4ea55bac8 Merge: 95b214d8e 712a622fc Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jan 23 11:18:14 2019 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug29135 | 5 +++++ src/feature/hs/hs_cache.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)