commit adeeb8841e0cb7c6b896b2d7a5bebf7d131af3ed Merge: 5ec566edd 712a622fc Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 23 11:18:14 2019 -0500

Merge branch 'maint-0.3.5'

changes/bug29135 | 5 +++++ src/feature/hs/hs_cache.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)